[Gpa-commits] r891 - in trunk: po src

Thu May 8 14:53:49 CEST 2008

Author: werner
Date: 2008-05-08 14:53:41 +0200 (Thu, 08 May 2008)
New Revision: 891

Modified:
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/po/ar.po
   trunk/po/cs.po
   trunk/po/de.po
   trunk/po/es.po
   trunk/po/fr.po
   trunk/po/ja.po
   trunk/po/nl.po
   trunk/po/pl.po
   trunk/po/pt_BR.po
   trunk/po/ru.po
   trunk/po/sv.po
   trunk/po/tr.po
   trunk/po/zh_TW.Big5.po
   trunk/src/keyring.c
Log:
Updated the German translation.  
We expect more translation changes before a release. 


Modified: trunk/po/ChangeLog
===================================================================

--- trunk/po/ChangeLog	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/ChangeLog	2008-05-08 12:53:41 UTC (rev 891)
@@ -1,3 +1,9 @@
+2008-05-08  Werner Koch  <wk at g10code.com>
+
+	* de.po: Update.
+
+	* POTFILES.in: Remove gpawizard.c.
+
 2008-03-20  Marcus Brinkmann  <marcus at g10code.de>
 
 	* ar.po, es.po, fr.po, ru.po: Updates from Alberto

Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/POTFILES.in	2008-05-08 12:53:41 UTC (rev 891)
@@ -38,7 +38,6 @@
 src/gpasubkeylist.c
 src/gpawidgets.c
 src/gpawindowkeeper.c
-src/gpawizard.c
 src/gpgmeedit.c
 src/gpgmetools.c
 src/gtktools.c

Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/ar.po	2008-05-08 12:53:41 UTC (rev 891)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GPA\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-03-20 22:28+0100\n"
+"POT-Creation-Date: 2008-05-08 14:51+0200\n"
 "PO-Revision-Date: 2008-03-17 13:05+0100\n"
 "Last-Translator: \n"
 "Language-Team: Arabic <doc at arabeyes.org>\n"
@@ -17,332 +17,152 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n>=3 && "
 "n<=10 ? 3 : n>=11 && n<=99 ? 4 : 5;\n"
 
-#: src/clipboard.c:381 src/fileman.c:393
+#: src/clipboard.c:376 src/fileman.c:392
 msgid "Open File"
 msgstr "Ø§ÙØªØ Ù…Ù„ÙØ§"
 
-#: src/clipboard.c:409 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "Ø±Ø³Ø§Ù„Ø© GPA"
 
 #. TRANSLATORS: The arguments are the filename, the integer size
 #. and the unit (such as KB or MB).
-#: src/clipboard.c:426
+#: src/clipboard.c:421
 #, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
 msgstr "Ø§Ù„Ù…Ù„Ù %s ØØ¬Ù…Ù‡ %lli%s.  Ø£ØªØ±ÙŠØ¯ ØÙ‚Ø§ ÙØªØÙ‡ØŸ"
 
-#: src/clipboard.c:547
+#: src/clipboard.c:542
 msgid "Save As..."
 msgstr "Ø§ØÙØ¸ Ø¨Ø§Ø³Ù…..."
 
-#: src/clipboard.c:588 src/clipboard.c:618 src/clipboard.c:648
-#: src/clipboard.c:678 src/clipboard.c:1184 src/fileman.c:716
-#: src/keyring.c:1657
+#: src/clipboard.c:583 src/clipboard.c:613 src/clipboard.c:643
+#: src/clipboard.c:673 src/clipboard.c:1034
 msgid "Clipboard"
 msgstr "Ø§Ù„ØØ§ÙØ¸Ø©"
 
-#: src/clipboard.c:758 src/fileman.c:513 src/keyring.c:863
-msgid "/_File"
+#: src/clipboard.c:755 src/fileman.c:515 src/keyring.c:884
+#, fuzzy
+msgid "_File"
 msgstr "/_Ù…Ù„Ù"
 
-#: src/clipboard.c:759 src/fileman.c:515
-msgid "/File/C_lear"
-msgstr "/Ù…Ù„Ù/Ø§_Ù…Ø³Ø"
-
-#: src/clipboard.c:760 src/fileman.c:514
-msgid "/File/_Open"
-msgstr "/Ù…Ù„Ù/_Ø§ÙØªØ"
-
-#: src/clipboard.c:761
-msgid "/File/Save _As"
-msgstr "/Ù…Ù„Ù/Ø§ØÙØ¸ _Ø¨Ø§Ø³Ù…"
-
-#: src/clipboard.c:763 src/fileman.c:516
-msgid "/File/sep1"
-msgstr "/Ù…Ù„Ù/sep1"
-
-#: src/clipboard.c:764 src/fileman.c:517
-msgid "/File/_Sign"
-msgstr "/Ù…Ù„Ù/_ÙˆÙ‚Ù‘Ø¹"
-
-#: src/clipboard.c:765 src/fileman.c:518
-msgid "/File/_Verify"
-msgstr "/Ù…Ù„Ù/_ØªØÙ‚Ù‚"
-
-#: src/clipboard.c:766 src/fileman.c:519
-msgid "/File/_Encrypt"
-msgstr "/Ù…Ù„Ù/_Ø¹Ù…Ù‘"
-
-#: src/clipboard.c:767 src/fileman.c:520
-msgid "/File/_Decrypt"
-msgstr "/Ù…Ù„Ù/_Ø¸Ù‡Ù‘ÙØ±"
-
-#: src/clipboard.c:768 src/fileman.c:521
-msgid "/File/sep2"
-msgstr "/Ù…Ù„Ù/sep2"
-
-#: src/clipboard.c:769 src/fileman.c:522 src/keyring.c:864
-msgid "/File/_Close"
-msgstr "/Ù…Ù„Ù/Ø£_ØºÙ„Ù‚"
-
-#: src/clipboard.c:770 src/fileman.c:523 src/keyring.c:866
-msgid "/File/_Quit"
-msgstr "/Ù…Ù„Ù/Ø§_Ø®Ø±Ø¬"
-
-#: src/clipboard.c:773 src/fileman.c:526 src/keyring.c:869
-msgid "/_Edit"
+#: src/clipboard.c:756 src/fileman.c:516 src/keyring.c:885
+#, fuzzy
+msgid "_Edit"
 msgstr "/_ØªØØ±ÙŠØ±"
 
-#: src/clipboard.c:776
-msgid "/Edit/_Undo"
-msgstr "/ØªØØ±ÙŠØ±/_ØªØ±Ø§Ø¬Ø¹"
+#: src/clipboard.c:760
+msgid "Clear buffer"
+msgstr "ÙŠØ®Ù„ÙŠ Ø§Ù„Ø¨Ø±Ø§Ø"
 
-#: src/clipboard.c:777
-msgid "/Edit/_Redo"
-msgstr "/ØªØØ±ÙŠØ±/Ø£_Ø¹ÙØ¯"
+#: src/clipboard.c:762 src/fileman.c:520
+msgid "Open a file"
+msgstr "ÙŠÙØªØ Ù…Ù„ÙØ§"
 
-#: src/clipboard.c:778
-msgid "/Edit/sep0"
-msgstr "/ØªØØ±ÙŠØ±/sep0"
+#: src/clipboard.c:764
+msgid "Save to a file"
+msgstr "ÙŠØÙØ¸ ÙÙŠ Ù…Ù„Ù"
 
-#: src/clipboard.c:780 src/clipboard.c:816
-msgid "/Edit/Cut"
-msgstr "/ØªØØ±ÙŠØ±/Ù‚Øµ"
+#: src/clipboard.c:766
+#, fuzzy
+msgid "Sign buffer text"
+msgstr "ÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù†ØµÙ‘"
 
-#: src/clipboard.c:781 src/keyring.c:870
-msgid "/Edit/_Copy"
-msgstr "/ØªØØ±ÙŠØ±/Ø§_Ù†Ø³Ø®"
+#: src/clipboard.c:768
+#, fuzzy
+msgid "Check signatures of buffer text"
+msgstr "ÙŠØªØÙ‚Ù‘ÙŽÙ‚ Ù…Ù† ØªÙˆÙ‚ÙŠØ¹Ø§Øª Ø§Ù„Ù†ØµÙ‘ Ø§Ù„Ù…ØØ¯Ø¯"
 
-#: src/clipboard.c:782 src/keyring.c:872
-msgid "/Edit/_Paste"
-msgstr "/ØªØØ±ÙŠØ±/Ø§_Ù„ØµÙ‚"
+#: src/clipboard.c:770
+#, fuzzy
+msgid "Encrypt the buffer text"
+msgstr "ÙŠØ¹Ù…Ù‘ÙŠ Ø§Ù„Ù†ØµÙ‘ Ø§Ù„Ù…ØØ¯Ø¯"
 
-#: src/clipboard.c:783
-msgid "/Edit/_Delete"
-msgstr "/ØªØØ±ÙŠØ±/Ø§_ØØ°Ù"
+#: src/clipboard.c:772
+#, fuzzy
+msgid "Decrypt the buffer text"
+msgstr "ÙŠØ¸Ù‡Ù‘ÙØ± Ø§Ù„Ù†ØµÙ‘ Ø§Ù„Ù…ØØ¯Ø¯"
 
-#: src/clipboard.c:784 src/keyring.c:874
-msgid "/Edit/sep1"
-msgstr "/ØªØØ±ÙŠØ±/sep1"
-
-#: src/clipboard.c:785 src/fileman.c:527 src/keyring.c:875
-msgid "/Edit/Select _All"
-msgstr "/ØªØØ±ÙŠØ±/Ø§_Ø®ØªØ± Ø§Ù„ÙƒÙ„"
-
-#: src/clipboard.c:787 src/fileman.c:528 src/keyring.c:876
-msgid "/Edit/sep2"
-msgstr "/ØªØØ±ÙŠØ±/sep2"
-
-#: src/clipboard.c:788 src/fileman.c:529 src/keyring.c:877
-msgid "/Edit/Pr_eferences..."
-msgstr "/ØªØØ±ÙŠØ±/Ø§Ù„_ØªÙØ¶ÙŠÙ„Ø§Øª..."
-
-#: src/clipboard.c:790 src/fileman.c:531 src/keyring.c:879
-msgid "/Edit/_Backend Preferences..."
-msgstr "/ØªØØ±ÙŠØ±/ØªÙØ¶ÙŠÙ„Ø§Øª Ø§Ù„_Ø®Ù„ÙÙŠØ©..."
-
-#: src/clipboard.c:794 src/fileman.c:535 src/keyring.c:906
-msgid "/_Windows"
-msgstr "/_Ù†ÙˆØ§ÙØ°"
-
-#: src/clipboard.c:795 src/fileman.c:536 src/keyring.c:907
-msgid "/Windows/_Keyring Editor"
-msgstr "/Ù†ÙˆØ§ÙØ°/_Ù…ØØ±Ø± ØÙ„Ù‚Ø© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
-
-#: src/clipboard.c:796 src/fileman.c:537
-msgid "/Windows/_Filemanager"
-msgstr "/Ù†ÙˆØ§ÙØ°/_Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ù„ÙØ§Øª"
-
-#: src/clipboard.c:797 src/fileman.c:538 src/keyring.c:909
-msgid "/Windows/_Clipboard"
-msgstr "/Ù†ÙˆØ§ÙØ°/Ø§Ù„_ØØ§ÙØ¸Ø©"
-
-#: src/clipboard.c:824 src/keyring.c:948
-msgid "/Edit/Copy"
-msgstr "/ØªØØ±ÙŠØ±/Ø§Ù†Ø³Ø®"
-
-#: src/clipboard.c:832
-msgid "/Edit/Delete"
-msgstr "/ØªØØ±ÙŠØ±/Ø§ØØ°Ù"
-
-#: src/clipboard.c:840
-msgid "/Edit/Paste"
-msgstr "/ØªØØ±ÙŠØ±/Ø£Ù„ØµÙ‚"
-
-#: src/clipboard.c:945
-msgid "Clear buffer"
+#: src/clipboard.c:774
+#, fuzzy
+msgid "Close the buffer"
 msgstr "ÙŠØ®Ù„ÙŠ Ø§Ù„Ø¨Ø±Ø§Ø"
 
-#: src/clipboard.c:945
-msgid "clear buffer"
-msgstr "Ø£Ø®Ù„ Ø§Ù„Ø¨Ø±Ø§Ø"
+#: src/clipboard.c:776 src/fileman.c:534 src/keyring.c:893
+msgid "Quit the program"
+msgstr ""
 
-#: src/clipboard.c:953 src/fileman.c:643
-msgid "Open a file"
-msgstr "ÙŠÙØªØ Ù…Ù„ÙØ§"
+#: src/clipboard.c:782
+#, fuzzy
+msgid "Undo the last action"
+msgstr "ÙŠÙ†Ø³Ø® Ø§Ù„Ù…ØØ¯Ø¯"
 
-#: src/clipboard.c:953 src/fileman.c:643
-msgid "open file"
-msgstr "Ø§ÙØªØ Ù…Ù„ÙØ§"
+#: src/clipboard.c:784
+msgid "Redo the last undone action"
+msgstr ""
 
-#: src/clipboard.c:958
-msgid "Save to a file"
-msgstr "ÙŠØÙØ¸ ÙÙŠ Ù…Ù„Ù"
-
-#: src/clipboard.c:958
-msgid "save file as"
-msgstr "Ø§ØÙØ¸ Ø§Ù„Ù…Ù„Ù Ø¨Ø§Ø³Ù…"
-
-#: src/clipboard.c:966
+#: src/clipboard.c:787
 msgid "Cut the selection"
 msgstr "ÙŠÙ‚Øµ Ø§Ù„Ù…ØØ¯Ø¯ Ø¥Ù„Ù‰ Ø§Ù„ØØ§ÙØ¸Ø©"
 
-#: src/clipboard.c:967
-msgid "cut the selection"
-msgstr "Ù‚Øµ Ø§Ù„Ù…ØØ¯Ø¯"
-
-#: src/clipboard.c:973
+#: src/clipboard.c:789 src/keyring.c:897
 msgid "Copy the selection"
 msgstr "ÙŠÙ†Ø³Ø® Ø§Ù„Ù…ØØ¯Ø¯"
 
-#: src/clipboard.c:974
-msgid "copy the selection"
-msgstr "Ø§Ù†Ø³Ø® Ø§Ù„Ù…ØØ¯Ø¯"
-
-#: src/clipboard.c:980
+#: src/clipboard.c:791 src/keyring.c:899
 msgid "Paste the clipboard"
 msgstr "ÙŠÙ„ØµÙ‚ Ù…Ø§ ÙÙŠ Ø§Ù„ØØ§ÙØ¸Ø©"
 
-#: src/clipboard.c:981
-msgid "paste the clipboard"
-msgstr "Ø£Ù„ØµÙ‚ Ø§Ù„ØØ§ÙØ¸Ø©"
-
-#: src/clipboard.c:991 src/fileman.c:653 src/keyring.c:1570
-msgid "Sign"
-msgstr "ÙˆÙ‚Ù‘Ø¹"
-
-#: src/clipboard.c:992
-msgid "Sign the selected text"
-msgstr "ÙŠÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù†ØµÙŽ Ø§Ù„Ù…ØØ¯Ø¯"
-
-#: src/clipboard.c:993
-msgid "sign text"
-msgstr "ÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù†ØµÙ‘"
-
-#: src/clipboard.c:1001 src/fileman.c:664
-msgid "Verify"
-msgstr "ØªØÙ‚Ù‚"
-
-#: src/clipboard.c:1002
-msgid "Check signatures of selected text"
-msgstr "ÙŠØªØÙ‚Ù‘ÙŽÙ‚ Ù…Ù† ØªÙˆÙ‚ÙŠØ¹Ø§Øª Ø§Ù„Ù†ØµÙ‘ Ø§Ù„Ù…ØØ¯Ø¯"
-
-#: src/clipboard.c:1003
-msgid "verify text"
-msgstr "ØªØÙ‚Ù‚ Ù…Ù† Ø§Ù„Ù†ØµÙ‘"
-
-#: src/clipboard.c:1011 src/fileman.c:675
-msgid "Encrypt"
-msgstr "Ø¹Ù…Ù‘"
-
-#: src/clipboard.c:1012
-msgid "Encrypt the selected text"
-msgstr "ÙŠØ¹Ù…Ù‘ÙŠ Ø§Ù„Ù†ØµÙ‘ Ø§Ù„Ù…ØØ¯Ø¯"
-
-#: src/clipboard.c:1013
-msgid "encrypt text"
-msgstr "Ø¹Ù…Ù‘ Ø§Ù„Ù†ØµÙ‘"
-
-#: src/clipboard.c:1021 src/fileman.c:686
-msgid "Decrypt"
-msgstr "Ø¸Ù‡Ù‘ÙØ±"
-
-#: src/clipboard.c:1022
-msgid "Decrypt the selected text"
+#: src/clipboard.c:793
+#, fuzzy
+msgid "Delete the selected text"
 msgstr "ÙŠØ¸Ù‡Ù‘ÙØ± Ø§Ù„Ù†ØµÙ‘ Ø§Ù„Ù…ØØ¯Ø¯"
 
-#: src/clipboard.c:1023
-msgid "decrypt text"
-msgstr "Ø¸Ù‡Ù‘ÙØ± Ø§Ù„Ù†ØµÙ‘"
+#: src/clipboard.c:795
+msgid "Select the entire document"
+msgstr ""
 
-#: src/clipboard.c:1033 src/fileman.c:699 src/keyring.c:1631
-msgid "Open the preferences dialog"
-msgstr "ÙŠÙØªØ ØÙˆØ§Ø± Ø§Ù„ØªÙØ¶ÙŠÙ„Ø§Øª"
-
-#: src/clipboard.c:1034 src/fileman.c:700 src/keyring.c:1632
-msgid "preferences"
-msgstr "Ø§Ù„ØªÙØ¶ÙŠÙ„Ø§Øª"
-
-#: src/clipboard.c:1041 src/fileman.c:707
+#: src/clipboard.c:902 src/fileman.c:625
 msgid "Keyring"
 msgstr "ØÙ„Ù‚Ø© Ù…ÙØ§ØªÙŠØ"
 
-#: src/clipboard.c:1042 src/fileman.c:708
-msgid "Open the keyring editor"
-msgstr "ÙŠÙØªØ Ù…ØØ±Ø± ØÙ„Ù‚Ø© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
-
-#: src/clipboard.c:1043 src/fileman.c:709
-msgid "keyring editor"
-msgstr "Ù…ØØ±Ø± ØÙ„Ù‚Ø© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
-
-#: src/clipboard.c:1049 src/keyring.c:1648
+#: src/clipboard.c:904 src/keyring.c:1073
 msgid "Files"
 msgstr "Ù…Ù„ÙØ§Øª"
 
-#: src/clipboard.c:1050 src/keyring.c:1649
-msgid "Open the file manager"
-msgstr "ÙŠÙØªØ Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ù„ÙØ§Øª"
-
-#: src/clipboard.c:1051 src/keyring.c:1650
-msgid "file manager"
-msgstr "Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ù„ÙØ§Øª"
-
-#: src/clipboard.c:1058 src/fileman.c:725 src/keyring.c:1665
-msgid "Help"
-msgstr "Ù…Ø³Ø§Ø¹Ø¯Ø©"
-
-#: src/clipboard.c:1059 src/fileman.c:726 src/keyring.c:1666
-msgid "Understanding the GNU Privacy Assistant"
-msgstr "Ø´Ø±Ø Ù…Ø³Ø§Ø¹Ø¯ Ø®ØµÙˆØµÙŠØ© Ø¬Ù†Ùˆ"
-
-#: src/clipboard.c:1060 src/fileman.c:727 src/keyring.c:1667
-msgid "help"
-msgstr "Ù…Ø³Ø§Ø¹Ø¯Ø©"
-
-#: src/clipboard.c:1150
+#: src/clipboard.c:1004
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "Ù…Ø³Ø§Ø¹Ø¯ Ø®ØµÙˆØµÙŠØ© Ø¬Ù†Ùˆ - Ø§Ù„ØØ§ÙØ¸Ø©"
 
-#: src/confdialog.c:993
+#: src/confdialog.c:994
 msgid "<b>Main</b>"
 msgstr "<b>Ø§Ù„Ø±Ø¦ÙŠØ³ÙŠ</b>"
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default values"
 msgstr "ÙŠØ³ØªØ®Ø¯Ù… Ø§Ù„Ù‚ÙŠÙ… Ø§Ù„Ø¨Ø¯Ø¦ÙŠØ©"
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default value"
 msgstr "Ø§Ø³ØªØ®Ø¯Ù… Ø§Ù„Ù‚ÙŠÙ…Ø© Ø§Ù„Ø¨Ø¯Ø¦ÙŠØ©"
 
-#: src/confdialog.c:1146
+#: src/confdialog.c:1147
 msgid "Do not use option"
 msgstr "Ù„Ø§ ØªØ³ØªØ®Ø¯Ù… Ø§Ù„Ø®ÙŠØ§Ø±"
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom values"
 msgstr "ÙŠØ³ØªØ®Ø¯Ù… Ù‚ÙŠÙ… Ù…Ø¹ÙŠÙ†Ø©"
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom value"
 msgstr "Ø§Ø³ØªØ®Ø¯Ù… Ù‚ÙŠÙ…Ø© Ù…Ø¹ÙŠÙ†Ø©"
 
-#: src/confdialog.c:1155
+#: src/confdialog.c:1156
 msgid "Use default argument"
 msgstr "Ø§Ø³ØªØ®Ø¯Ù… Ø§Ù„Ù…Ø¹Ø·Ù‰ Ø§Ù„Ø¨Ø¯Ø¦ÙŠ"
 
-#: src/confdialog.c:1280
+#: src/confdialog.c:1281
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
@@ -350,58 +170,51 @@
 "Ù‡Ù†Ø§Ùƒ ØªØºÙŠÙŠØ±Ø§Øª Ù‚Ù…Øª Ø¨Ù‡Ø§ Ù„Ù… ØªÙØ·Ø¨Ù‘Ù‚. ØªØºÙŠÙŠØ± Ø¥Ø¹Ø¯Ø§Ø¯ Ø§Ù„Ø®Ø¨ÙŠØ± Ø³ÙŠÙØ·Ø¨Ù‘Ù‚ Ù‡Ø°Ù‡ Ø§Ù„ØªØºÙŠÙŠØ±Ø§Øª.  Ø£ØªØ±ÙŠØ¯ "
 "Ø§Ù„Ù…ÙˆØ§ØµÙ„Ø©ØŸ"
 
-#: src/confdialog.c:1325
+#: src/confdialog.c:1326
 msgid "Crypto Backend Configuration"
 msgstr "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ù…ØØ±Ù‘Ùƒ Ø§Ù„ØªØ¹Ù…ÙŠØ©"
 
-#: src/confdialog.c:1334
+#: src/confdialog.c:1332
 msgid "Reset"
 msgstr "ØµÙÙ‘Ø±"
 
-#: src/confdialog.c:1346
+#: src/confdialog.c:1351
 msgid "Configure the tools of the GnuPG system."
 msgstr "Ø§Ø¶Ø¨Ø· Ø£Ø¯ÙˆØ§Øª Ù†Ø¸Ø§Ù… GnuPG."
 
-#: src/confdialog.c:1350
+#: src/confdialog.c:1355
 msgid "Level:"
 msgstr "Ø§Ù„Ù…Ø³ØªÙˆÙ‰:"
 
-#: src/confdialog.c:1359
+#: src/confdialog.c:1364
 msgid "Basic"
 msgstr "Ø£Ø³Ø§Ø³ÙŠ"
 
-#: src/confdialog.c:1360
+#: src/confdialog.c:1365
 msgid "Advanced"
 msgstr "Ù…ØªÙ‚Ø¯Ù‘Ù…"
 
-#: src/confdialog.c:1361
+#: src/confdialog.c:1366
 msgid "Expert"
 msgstr "Ø®Ø¨ÙŠØ±"
 
-#: src/encryptdlg.c:142 src/expirydlg.c:116 src/filesigndlg.c:133
-#: src/gpaprogressdlg.c:146 src/gparecvkeydlg.c:96 src/gpawizard.c:289
-#: src/gpgmetools.c:705 src/keygendlg.c:149 src/ownertrustdlg.c:111
-#: src/passwddlg.c:100
-msgid "_Cancel"
-msgstr "Ø£_Ù„ØºÙ"
-
-#: src/encryptdlg.c:143
+#: src/encryptdlg.c:139
 msgid "Encrypt documents"
 msgstr "Ø¹Ù…Ù‘ Ø§Ù„ÙˆØ«ÙŠÙ‚Ø©"
 
-#: src/encryptdlg.c:174
+#: src/encryptdlg.c:156
 msgid "_Public Keys"
 msgstr "_Ù…ÙØ§ØªÙŠØ Ø¹Ù„Ù†ÙŠØ©"
 
-#: src/encryptdlg.c:177
+#: src/encryptdlg.c:179 src/icons.c:198
 msgid "_Sign"
 msgstr "_ÙˆÙ‚Ù‘ÙØ¹"
 
-#: src/encryptdlg.c:201 src/filesigndlg.c:185
+#: src/encryptdlg.c:185
 msgid "Sign _as "
 msgstr "ÙˆÙ‚Ù‘Ø¹ _Ø¨Ø§Ø³Ù…"
 
-#: src/encryptdlg.c:215 src/filesigndlg.c:187
+#: src/encryptdlg.c:215 src/filesigndlg.c:227
 msgid "A_rmor"
 msgstr "Ù…Ù_ØØµÙ‘Ù†"
 
@@ -409,116 +222,94 @@
 msgid "Please provide a correct date."
 msgstr "Ù…Ù† ÙØ¶Ù„Ùƒ Ø£Ø¯Ø®Ù„ ØªØ§Ø±ÙŠØ®Ø§ ØµØÙŠØØ§."
 
-#: src/expirydlg.c:111
+#: src/expirydlg.c:108
 msgid "Change expiry date"
 msgstr "ØºÙŠÙ‘Ø± ØªØ§Ø±ÙŠØ® Ø§Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: src/expirydlg.c:129
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+msgid "_Cancel"
+msgstr "Ø£_Ù„ØºÙ"
+
+#: src/expirydlg.c:124
 msgid "_never expire"
 msgstr "_Ù„Ø§ ØªÙ†ØªÙ‡ÙŠ Ø§Ù„ØµÙ„Ø§ØÙŠØ© Ø£Ø¨Ø¯Ø§"
 
-#: src/expirydlg.c:134
+#: src/expirydlg.c:129
 msgid "_expire on:"
 msgstr "Øª_Ù†ØªÙ‡ÙŠ ÙÙŠ:"
 
-#: src/fileman.c:557
-msgid "/File/Sign"
-msgstr "/Ù…Ù„Ù/ÙˆÙ‚Ù‘Ø¹"
-
-#: src/fileman.c:562
-msgid "/File/Verify"
-msgstr "/Ù…Ù„Ù/ØªØÙ‚Ù‚"
-
-#: src/fileman.c:567
-msgid "/File/Encrypt"
-msgstr "/Ù…Ù„Ù/Ø¹Ù…Ù‘"
-
-#: src/fileman.c:572
-msgid "/File/Decrypt"
-msgstr "/Ù…Ù„Ù/Ø§Ø³ØªØ®Ø±Ø¬"
-
-#: src/fileman.c:647
+#: src/fileman.c:522
 msgid "Close all files"
 msgstr "Ø£ØºÙ„Ù‚ ÙƒÙ„ Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: src/fileman.c:647
-msgid "close files"
-msgstr "Ø£ØºÙ„Ù‚ Ø§Ù„Ù…Ù„ÙØ§Øª"
-
-#: src/fileman.c:654
+#: src/fileman.c:524
 msgid "Sign the selected file"
 msgstr "ÙŠÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù…Ù„Ù Ø§Ù„Ù…ÙØØ¯Ø¯"
 
-#: src/fileman.c:655
-msgid "sign file"
-msgstr "ÙˆÙ‚Ø¹ Ù…Ù„ÙÙ‘Ø§"
-
-#: src/fileman.c:665
+#: src/fileman.c:526
 msgid "Check signatures of selected file"
 msgstr "ÙŠØªØÙ‚Ù‘Ù‚ Ù…Ù† ØªÙˆÙ‚ÙŠØ¹Ø§Øª Ø§Ù„Ù…Ù„Ù Ø§Ù„Ù…ØØ¯Ø¯"
 
-#: src/fileman.c:666
-msgid "verify file"
-msgstr "ØªØÙ‚Ù‚ Ù…Ù† Ø§Ù„Ù…Ù„ÙÙ‘"
-
-#: src/fileman.c:676
+#: src/fileman.c:528
 msgid "Encrypt the selected file"
 msgstr "ÙŠØ¹Ù…Ù‘ÙŠ Ø§Ù„Ù…Ù„Ù Ø§Ù„Ù…ØØ¯Ø¯"
 
-#: src/fileman.c:677
-msgid "encrypt file"
-msgstr "Ø¹Ù…Ù‘ Ø§Ù„Ù…Ù„ÙÙ‘"
-
-#: src/fileman.c:687
+#: src/fileman.c:530
 msgid "Decrypt the selected file"
 msgstr "ÙŠØ¸Ù‡Ù‘ÙØ± Ø§Ù„Ù…Ù„Ù Ø§Ù„Ù…ØØ¯Ø¯"
 
-#: src/fileman.c:688
-msgid "decrypt file"
-msgstr "Ø§Ø³ØªØ®Ø±Ø¬ Ø§Ù„Ù…Ù„ÙÙ‘"
+#: src/fileman.c:532
+msgid "Close the window"
+msgstr ""
 
-#: src/fileman.c:717 src/keyring.c:1658
-msgid "Open the clipboard"
-msgstr "ÙŠÙØªØ Ø§Ù„ØØ§ÙØ¸Ø©"
+#: src/fileman.c:538
+#, fuzzy
+msgid "Select all files"
+msgstr "Ø£ØºÙ„Ù‚ ÙƒÙ„ Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: src/fileman.c:718 src/keyring.c:1659
-msgid "clipboard"
-msgstr "Ø§Ù„ØØ§ÙØ¸Ø©"
-
-#: src/fileman.c:826
+#: src/fileman.c:731
 msgid "File"
 msgstr "Ù…Ù„Ù"
 
-#: src/fileman.c:891
+#: src/fileman.c:796
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "Ù…Ø³Ø§Ø¹Ø¯ Ø®ØµÙˆØµÙŠØ© Ø¬Ù†Ùˆ - Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: src/fileman.c:917
+#: src/fileman.c:819
 msgid "File Manager"
 msgstr "Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: src/fileman.c:993
+#: src/fileman.c:895
 msgid "The file is already open."
 msgstr "Ø§Ù„Ù…Ù„ÙÙ‘ Ù…ÙØªÙˆØ Ø¨Ø§Ù„ÙØ¹Ù„."
 
-#: src/filesigndlg.c:134
+#: src/filesigndlg.c:171
 msgid "Sign documents"
 msgstr "ÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: src/filesigndlg.c:144
-msgid "Signing Mode"
+#: src/filesigndlg.c:180
+#, fuzzy
+msgid "<b>Sign _as</b>"
+msgstr "<b>Ø§Ù„Ø±Ø¦ÙŠØ³ÙŠ</b>"
+
+#: src/filesigndlg.c:201
+#, fuzzy
+msgid "<b>Signing Mode</b>"
 msgstr "Ù†Ù…Ø· Ø§Ù„ØªÙ‘ÙˆÙ‚ÙŠØ¹"
 
-#: src/filesigndlg.c:152
-msgid "si_gn and compress"
+#: src/filesigndlg.c:211
+#, fuzzy
+msgid "Si_gn and compress"
 msgstr "Ùˆ_Ù‚Ù‘Ø¹ ÙˆØ§Ø¶ØºØ·"
 
-#: src/filesigndlg.c:158
-msgid "_cleartext signature"
+#: src/filesigndlg.c:217
+#, fuzzy
+msgid "Clear_text signature"
 msgstr "ØªÙˆÙ‚ÙŠØ¹ Ù†Øµ _ØµØ±ÙŠØ"
 
-#: src/filesigndlg.c:165
-msgid "_detached signature"
+#: src/filesigndlg.c:223
+#, fuzzy
+msgid "_Detached signature"
 msgstr "ØªÙˆÙ‚ÙŠØ¹  _Ù…Ù†ÙØµÙÙ„"
 
 #: src/gpabackupop.c:208
@@ -568,22 +359,28 @@
 msgstr "ÙŠÙØªØ Ø§Ù„ØØ§ÙØ¸Ø©"
 
 #: src/gpa.c:100
-msgid "Start only the UI server (implies --cms)"
+#, fuzzy
+msgid "Open the settings dialog"
+msgstr "ÙŠÙØªØ ØÙˆØ§Ø± Ø§Ù„ØªÙØ¶ÙŠÙ„Ø§Øª"
+
+#: src/gpa.c:102
+#, fuzzy
+msgid "Enable the UI server (implies --cms)"
 msgstr "Ø§Ø¨Ø¯Ø£ ÙÙ‚Ø· Ø®Ø§Ø¯ÙˆÙ… ÙˆØ§Ø¬Ù‡Ø© Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… (ÙŠÙØªØ±Ø¶ â€ª--cmsâ€¬ Ø£ÙŠØ¶Ø§)"
 
-#: src/gpa.c:102
+#: src/gpa.c:104
 msgid "Read options from file"
 msgstr "Ø§Ù‚Ø±Ø£ Ø§Ù„Ø®ÙŠØ§Ø±Ø§Øª Ù…Ù† Ù…Ù„ÙÙ‘"
 
-#: src/gpa.c:293
+#: src/gpa.c:286
 msgid "[FILE...]"
 msgstr "[Ù…Ù„Ù...]"
 
-#: src/gpa.c:295
+#: src/gpa.c:288
 msgid "Graphical frontend to GnuPG"
 msgstr "ÙˆØ§Ø¬Ù‡Ø© Ø±Ø³ÙˆÙ…ÙŠØ© Ù„Ø£Ø¬Ù„ GnuPG"
 
-#: src/gpa.c:296
+#: src/gpa.c:289
 msgid "Please report bugs to <"
 msgstr "Ù…Ù† ÙØ¶Ù„Ùƒ Ø£Ø¨Ù„Øº Ø¹Ù† Ø§Ù„Ø¹Ù„Ø§Øª ÙÙŠ <"
 
@@ -615,15 +412,15 @@
 "Ø®Ø§Ø¯ÙˆÙ… Ù…ÙØ§ØªÙŠØ Ø¹Ù„Ù†ÙŠ (\"%s\").\n"
 "Ø£Ù…ØªØ£ÙƒØ¯ Ø£Ù†Ùƒ ØªØ±ÙŠØ¯ ØªÙˆØ²ÙŠØ¹ Ù‡Ø°Ø§ Ø§Ù„Ù…ÙØªØ§ØØŸ"
 
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:455
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:459
 #: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:62 src/settingsdlg.c:165
+#: src/keydeletedlg.c:93 src/keysigndlg.c:61
 msgid "_Yes"
 msgstr "_Ù†Ø¹Ù…"
 
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:456
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:460
 #: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:64 src/settingsdlg.c:168
+#: src/keydeletedlg.c:95 src/keysigndlg.c:63
 msgid "_No"
 msgstr "_Ù„Ø§"
 
@@ -635,29 +432,29 @@
 msgid "Decrypting..."
 msgstr "ÙŠØ¬Ø±ÙŠ Ø§Ù„ØªÙ‘ÙŽØ¸Ù‡ÙŠØ±..."
 
-#: src/gpafiledecryptop.c:358 src/gpafileverifyop.c:449
+#: src/gpafiledecryptop.c:367 src/gpafileverifyop.c:464
 #, c-format
 msgid "\"%s\" contained no OpenPGP data."
 msgstr "Ù„Ø§ ÙŠØØªÙˆÙŠ \"%s\" Ø¹Ù„Ù‰ Ø¨ÙŠØ§Ù†Ø§Øª OpenPGP."
 
-#: src/gpafiledecryptop.c:359 src/gpafileverifyop.c:450
+#: src/gpafiledecryptop.c:368 src/gpafileverifyop.c:465
 #, c-format
 msgid "The file \"%s\" contained no OpenPGPdata."
 msgstr "Ù„Ø§ ÙŠØØªÙˆÙŠ Ø§Ù„Ù…Ù„ÙÙ‘ \"%s\" Ø¹Ù„Ù‰ Ø¨ÙŠØ§Ù†Ø§Øª OpenPGP."
 
-#: src/gpafiledecryptop.c:369
+#: src/gpafiledecryptop.c:378
 #, c-format
 msgid "\"%s\" contained no valid encrypted data."
 msgstr "Ù„Ø§ ÙŠØÙˆÙŠ \"%s\" Ø¨ÙŠØ§Ù†Ø§Øª Ù…Ø¹Ù…Ø§Ø© ØµØ§Ù„ØØ©."
 
-#: src/gpafiledecryptop.c:371
+#: src/gpafiledecryptop.c:380
 #, c-format
 msgid "The file \"%s\" contained no validencrypted data."
 msgstr "Ù„Ø§ ÙŠØÙˆÙŠ Ø§Ù„Ù…Ù„ÙÙ‘ \"%s\" Ø¨ÙŠØ§Ù†Ø§Øª Ù…Ø¹Ù…Ø§Ø© ØµØ§Ù„ØØ©."
 
-#: src/gpafiledecryptop.c:380 src/gpafileencryptop.c:757
-#: src/gpafilesignop.c:511 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
-#: src/gpakeypasswdop.c:197 src/gpakeysignop.c:229
+#: src/gpafiledecryptop.c:389 src/gpafileencryptop.c:751
+#: src/gpafilesignop.c:525 src/gpafileverifyop.c:475 src/gpakeyexpireop.c:240
+#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:237
 msgid "Wrong passphrase!"
 msgstr "Ø¹Ø¨Ø§Ø±Ø© Ø§Ù„Ø³Ø± Ø®Ø·Ø£."
 
@@ -665,57 +462,56 @@
 msgid "Encrypting..."
 msgstr "ØªØ¬Ø±ÙŠ Ø§Ù„ØªØ¹Ù…ÙŠØ©..."
 
-#: src/gpafileencryptop.c:453 src/verifydlg.c:222
+#: src/gpafileencryptop.c:457 src/verifydlg.c:222
 msgid "Unknown Key"
 msgstr "Ù…ÙØªØ§Ø Ù…Ø¬Ù‡ÙˆÙ„"
 
-#: src/gpafileencryptop.c:469
+#: src/gpafileencryptop.c:473
 msgid "You are going to encrypt a document using the following key:"
 msgstr "Ø³ØªÙ‚ÙˆÙ… Ø¨ØªØ¹Ù…ÙŠØ© ÙˆØ«ÙŠÙ‚Ø© Ù…Ø³ØªØ®Ø¯Ù…Ø§ Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„ØªØ§Ù„ÙŠ:"
 
-#: src/gpafileencryptop.c:475
+#: src/gpafileencryptop.c:479
 msgid "However, it is not certain that the key belongs to that person."
 msgstr "Ø¥Ù„Ø§ Ø£Ù†Ù‡ Ù…Ù† ØºÙŠØ± Ø§Ù„Ù…Ø¤ÙƒØ¯ Ø£Ù† Ù‡Ø°Ø§ Ø§Ù„Ù…ÙØªØ§Ø ÙŠØ®Øµ Ø°Ø§Ùƒ Ø§Ù„Ø´Ø®Øµ."
 
-#: src/gpafileencryptop.c:481
+#: src/gpafileencryptop.c:485
 msgid "Do you <b>really</b> want to use this key?"
 msgstr "Ø£ØªØ±ÙŠØ¯ <b>ØÙ‚Ø§</b> Ø§Ø³ØªØ®Ø¯Ø§Ù… Ù‡Ø°Ø§ Ø§Ù„Ù…ÙØªØ§ØØŸ"
 
-#: src/gpafileencryptop.c:502 src/gpafileencryptop.c:542 src/verifydlg.c:227
+#: src/gpafileencryptop.c:506 src/gpafileencryptop.c:546 src/verifydlg.c:227
 msgid "Revoked Key"
 msgstr "Ù…ÙØªØ§Ø Ù…Ù†Ù‚ÙˆØ¶"
 
-#: src/gpafileencryptop.c:504 src/gpafileencryptop.c:544 src/gpawizard.c:281
-#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:436
-#: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
+#: src/gpafileencryptop.c:508 src/gpafileencryptop.c:548 src/gtktools.c:52
+#: src/gtktools.c:86 src/keyeditdlg.c:149 src/verifydlg.c:115
 msgid "_Close"
 msgstr "Ø£_ØºÙ„Ù‚"
 
-#: src/gpafileencryptop.c:517
+#: src/gpafileencryptop.c:521
 msgid "The following key has been revoked by it's owner:"
 msgstr "Ù†ÙÙ‚Ø¶ Ù‡Ø°Ø§ Ø§Ù„Ù…ÙØªØ§Ø Ù…Ù† Ù‚ÙØ¨ÙÙ„ Ù…Ø§Ù„ÙƒÙ‡:"
 
-#: src/gpafileencryptop.c:522 src/gpafileencryptop.c:565
+#: src/gpafileencryptop.c:526 src/gpafileencryptop.c:569
 msgid "And can not be used for encryption."
 msgstr "ÙˆÙ„Ø§ ÙŠÙ…ÙƒÙ† Ø§Ø³ØªØ®Ø¯Ø§Ù…Ù‡ Ù„Ù„ØªØ¹Ù…ÙŠØ©."
 
-#: src/gpafileencryptop.c:557
+#: src/gpafileencryptop.c:561
 #, c-format
 msgid "The following key expired on %s:"
 msgstr "Ø§Ù†ØªÙ‡Øª ØµÙ„Ø§ØÙŠØ© Ù‡Ø°Ø§ Ø§Ù„Ù…ÙØªØ§Ø ÙÙŠ %s:"
 
-#: src/gpafileencryptop.c:596 src/gpafilesignop.c:429
+#: src/gpafileencryptop.c:600 src/gpafilesignop.c:448
 msgid ""
 "The selected certificates are not all of the same type. That is, you mixed "
 "OpenPGP and X.509 certificates. Please make sure to select only certificates "
 "of the same type."
 msgstr ""
 
-#: src/gpafileencryptop.c:671 src/gpafilesignop.c:415
+#: src/gpafileencryptop.c:675 src/gpafilesignop.c:434
 msgid "You didn't select any key for signing"
 msgstr "Ù„Ù… ØªØØ¯Ø¯ Ù…ÙØªØ§ØØ§ Ù„Ù„ØªÙˆÙ‚ÙŠØ¹"
 
-#: src/gpafilesignop.c:148
+#: src/gpafilesignop.c:157
 msgid "Signing..."
 msgstr "ÙŠØ¬Ø±ÙŠ Ø§Ù„ØªÙˆÙ‚ÙŠØ¹..."
 
@@ -743,11 +539,11 @@
 msgid "Import public keys from file"
 msgstr "Ø§Ø³ØªÙˆØ±Ø¯ Ø§Ù„Ù…ÙØ§ØªÙŠØ Ø§Ù„Ø¹Ù„Ù†ÙŠØ© Ù…Ù† Ù…Ù„ÙÙ‘"
 
-#: src/gpaimportop.c:197
+#: src/gpaimportop.c:196
 msgid "No keys were found."
 msgstr "Ù„Ù… ØªÙˆØ¬Ø¯ Ù…ÙØ§ØªÙŠØ."
 
-#: src/gpaimportop.c:205
+#: src/gpaimportop.c:204
 #, c-format
 msgid ""
 "%i public keys read\n"
@@ -764,7 +560,7 @@
 "Ø§Ø³ØªÙÙˆØ±ÙØ¯Øª %i Ù…ÙØ§ØªÙŠØ Ø³Ø±Ù‘ÙŠØ©\n"
 "Ù„Ù… ØªØªØºÙŠØ± %i Ù…ÙØ§ØªÙŠØ Ø³Ø±Ù‘ÙŠØ©"
 
-#: src/gpakeyexpireop.c:239
+#: src/gpakeyexpireop.c:244
 msgid ""
 "Invalid time given.\n"
 "(you may not set the expiration time to the past.)"
@@ -772,29 +568,29 @@
 "Ø£ÙØ¯Ø®Ù„Øª ÙˆÙ‚ØªØ§ ØºÙŠØ± ØµØÙŠØ.\n"
 "(Ù„Ø§ ÙŠÙ…ÙƒÙ† Ø£Ù† ÙŠÙƒÙˆÙ† ØªØ§Ø±ÙŠØ® Ø§Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ© ÙÙŠ Ø§Ù„Ù…Ø§Ø¶ÙŠ.)"
 
-#: src/gpakeyselector.c:86 src/keylist.c:567 src/siglist.c:94
+#: src/gpakeyselector.c:86 src/keylist.c:555 src/siglist.c:94
 #: src/siglist.c:114 src/verifydlg.c:324
 msgid "Key ID"
 msgstr "Ù…Ø¹Ø±Ù‘ÙÙ Ø§Ù„Ù…ÙØªØ§Ø"
 
-#: src/gpakeyselector.c:95 src/keylist.c:618 src/siglist.c:100
+#: src/gpakeyselector.c:95 src/keylist.c:606 src/siglist.c:100
 #: src/siglist.c:143 src/verifydlg.c:336
 msgid "User Name"
 msgstr "Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…"
 
-#: src/gpakeysignop.c:188
+#: src/gpakeysignop.c:191
 msgid "No private key for signing."
 msgstr "Ù„Ø§ Ù…ÙØªØ§Ø Ø³Ø±Ù‘ÙŠ Ù„Ù„ØªØ¹Ù…ÙŠØ©."
 
-#: src/gpakeysignop.c:233
+#: src/gpakeysignop.c:241
 msgid "This key has expired! Unable to sign."
 msgstr "Ø§Ù†ØªÙ‡Øª ØµÙ„Ø§ØÙŠØ© Ù‡Ø°Ø§ Ø§Ù„Ù…ÙØªØ§Ø. ØªØ¹Ø°Ù‘Ø± Ø§Ù„ØªÙˆÙ‚ÙŠØ¹."
 
-#: src/gpakeysignop.c:237
+#: src/gpakeysignop.c:245
 msgid "This key has already been signed with your own!"
 msgstr "Ù‡Ø°Ø§ Ø§Ù„Ù…ÙØªØ§Ø Ù…ÙˆÙ‚Ø¹ Ø¨Ù…ÙØªØ§ØÙƒ Ø¨Ø§Ù„ÙÙØ¹Ù„!"
 
-#: src/gpakeysignop.c:242
+#: src/gpakeysignop.c:250
 msgid "You haven't selected a default key to sign with!"
 msgstr "Ù„Ù… ØªØ®ØªØ± Ù…ÙØªØ§Ø Ø§Ù„ØªÙˆÙ‚ÙŠØ¹ Ø§Ù„Ø¨Ø¯Ø¦ÙŠ."
 
@@ -822,7 +618,7 @@
 msgid "unknown"
 msgstr "Ù…Ø¬Ù‡ÙˆÙ„"
 
-#: src/gparecvkeydlg.c:101
+#: src/gparecvkeydlg.c:106
 msgid "Which key do you want to import? (The key must be specified by key ID)."
 msgstr "Ø£ÙŠ Ø§Ù„Ù…ÙØ§ØªÙŠØ ØªØ±ÙŠØ¯ Ø§Ø³ØªÙŠØ±Ø§Ø¯Ù‡ØŸ (ÙŠØ¬Ø¨ ØªØØ¯ÙŠØ¯Ù‡ Ø¨Ù…Ø¹Ø±Ù‘ÙÙ Ø§Ù„Ù…ÙØªØ§Ø)."
 
@@ -846,7 +642,7 @@
 msgid "Size"
 msgstr "Ø§Ù„Ø·ÙˆÙ„"
 
-#: src/gpasubkeylist.c:97 src/keyeditdlg.c:171 src/keylist.c:580
+#: src/gpasubkeylist.c:97 src/keyeditdlg.c:168 src/keylist.c:568
 msgid "Expiry Date"
 msgstr "ØªØ§Ø±ÙŠØ® Ø§Ù„Ø§Ù†ØªÙ‡Ø§Ø¡"
 
@@ -866,12 +662,12 @@
 msgid "Can authenticate"
 msgstr "ÙŠÙ…ÙƒÙ† Ø§Ù„Ø§Ø³ØªÙŠØ«Ø§Ù‚ Ø¨Ù‡"
 
-#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:830
-#: src/gpgmetools.c:949
+#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:833
+#: src/gpgmetools.c:952
 msgid "Revoked"
 msgstr "Ù…Ù†Ù‚ÙˆØ¶"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:945
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:948
 msgid "Expired"
 msgstr "Ù…Ù†ØªÙ‡ÙŠØ© ØµÙ„Ø§ØÙŠØªÙ‡"
 
@@ -883,21 +679,21 @@
 msgid "Unsigned"
 msgstr "ØºÙŠØ± Ù…ÙˆÙ‚Ù‘Ø¹"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:936 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:939 src/verifydlg.c:212
 msgid "Valid"
 msgstr "ØµØ§Ù„Ø"
 
 #: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
-#: src/keyring.c:1176 src/keysigndlg.c:104
+#: src/keyring.c:1248 src/keysigndlg.c:100
 msgid "User Name:"
 msgstr "Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…:"
 
-#: src/gpawidgets.c:72 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/keysigndlg.c:100
 msgid "User Names:"
 msgstr "Ø£Ø³Ù…Ø§Ø¡ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…:"
 
 #: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
-#: src/keyring.c:1178
+#: src/keyring.c:1250
 msgid "Key ID:"
 msgstr "Ù…Ø¹Ø±Ù‘ÙÙ Ø§Ù„Ù…ÙØªØ§Ø:"
 
@@ -909,15 +705,15 @@
 msgid "_indefinitely valid"
 msgstr "_ØµØ§Ù„Ø Ø¨Ù„Ø§ Ù†Ù‡Ø§ÙŠØ©"
 
-#: src/gpawidgets.c:196
+#: src/gpawidgets.c:195
 msgid "expire _after"
 msgstr "ÙŠÙ†ØªÙ‡ÙŠ _Ø¨Ø¹Ø¯"
 
-#: src/gpawidgets.c:216
+#: src/gpawidgets.c:215
 msgid "expire o_n:"
 msgstr "ÙŠÙ†ØªÙ‡ÙŠ _ÙÙŠ:"
 
-#: src/gpawidgets.c:292 src/keygendlg.c:295
+#: src/gpawidgets.c:289 src/keygendlg.c:291
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -925,19 +721,7 @@
 "Ø®Ø·Ø£ ÙØ§Ø¯ÙØ!\n"
 "Ù†Ù…Ø· Ø¥Ø¯Ø®Ø§Ù„ Ø®Ø§Ø·Ø¦ Ù„ØªØ§Ø±ÙŠØ® Ø§Ù„Ø§Ù†ØªÙ‡Ø§Ø¡."
 
-#: src/gpawizard.c:260
-msgid "_Back"
-msgstr "Ù„Ù„_Ø®Ù„Ù"
-
-#: src/gpawizard.c:267
-msgid "_Forward"
-msgstr "Ù„Ù„Ø£_Ù…Ø§Ù…"
-
-#: src/gpawizard.c:274
-msgid "_Apply"
-msgstr "_Ø·Ø¨Ù‘Ù‚"
-
-#: src/gpgmetools.c:58
+#: src/gpgmetools.c:59
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -953,7 +737,7 @@
 "\n"
 "Ø³ÙŠÙØºÙ„Ù‚ Ø§Ù„ØªØ·Ø¨ÙŠÙ‚"
 
-#: src/gpgmetools.c:72
+#: src/gpgmetools.c:73
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -1016,7 +800,7 @@
 msgstr "â€RSA (Ù„Ù„ØªÙˆÙ‚ÙŠØ¹ ÙÙ‚Ø·)"
 
 #: src/gpgmetools.c:590 src/gpgmetools.c:613 src/gpgmetools.c:630
-#: src/gpgmetools.c:941 src/gpgmetools.c:974
+#: src/gpgmetools.c:944 src/gpgmetools.c:977
 msgid "Unknown"
 msgstr "Ù…Ø¬Ù‡ÙˆÙ„"
 
@@ -1056,129 +840,122 @@
 msgid "Enter Passphrase"
 msgstr "Ø£Ø¯Ø®Ù„ Ø¹Ø¨Ø§Ø±Ø© Ø§Ù„Ø³Ø±"
 
-#: src/gpgmetools.c:823
+#: src/gpgmetools.c:826
 msgid "[None]"
 msgstr "[Ù„Ø§Ø´ÙŠØ¡]"
 
-#: src/gpgmetools.c:913 src/verifydlg.c:269
+#: src/gpgmetools.c:916 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[Ù‡ÙˆÙŠØ© Ù…Ø³ØªØ®Ø¯Ù… Ù…Ø¬Ù‡ÙˆÙ„Ø©]"
 
-#: src/gpgmetools.c:939 src/verifydlg.c:217
+#: src/gpgmetools.c:942 src/verifydlg.c:217
 msgid "Bad"
 msgstr "Ø³ÙŠØ¦"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:965
 msgid "Generic"
 msgstr "Ø¹Ø§Ù…"
 
-#: src/gpgmetools.c:965
+#: src/gpgmetools.c:968
 msgid "Persona"
 msgstr "Ø´Ø®ØµÙŠ"
 
-#: src/gpgmetools.c:968
+#: src/gpgmetools.c:971
 msgid "Casual"
 msgstr "Ø¹Ø§Ø¯ÙŠ"
 
-#: src/gpgmetools.c:971
+#: src/gpgmetools.c:974
 msgid "Positive"
 msgstr "Ø¥ÙŠØ¬Ø§Ø¨ÙŠ"
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:992
 msgid "The key can be used for certification, signing and encryption."
 msgstr "ÙŠÙ…ÙƒÙ† Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø§Ù„Ù…ÙØªØ§Ø ÙÙŠ Ø§Ù„Ø´Ù‡Ø§Ø¯Ø© Ùˆ Ø§Ù„ØªÙˆÙ‚ÙŠØ¹ Ùˆ Ø§Ù„ØªØ¹Ù…ÙŠØ©."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:995
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr "ÙŠÙ…ÙƒÙ† Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø§Ù„Ù…ÙØªØ§Ø ÙÙŠ Ø§Ù„Ø´Ù‡Ø§Ø¯Ø© Ùˆ Ø§Ù„ØªÙˆÙ‚ÙŠØ¹ Ù„ÙƒÙ† Ù„ÙŠØ³ ÙÙŠ Ø§Ù„ØªØ¹Ù…ÙŠØ©."
 
-#: src/gpgmetools.c:998
+#: src/gpgmetools.c:1001
 msgid "The key can be used for certification and encryption."
 msgstr "ÙŠÙ…ÙƒÙ† Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø§Ù„Ù…ÙØªØ§Ø ÙÙŠ Ø§Ù„Ø´Ù‡Ø§Ø¯Ø© Ùˆ Ø§Ù„ØªØ¹Ù…ÙŠØ©."
 
-#: src/gpgmetools.c:1001
+#: src/gpgmetools.c:1004
 msgid "The key can be used only for certification."
 msgstr "ÙŠÙ…ÙƒÙ† Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø§Ù„Ù…ÙØªØ§Ø ÙÙŠ Ø§Ù„Ø´Ù‡Ø§Ø¯Ø© ÙÙ‚Ø·."
 
-#: src/gpgmetools.c:1009
+#: src/gpgmetools.c:1012
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
 msgstr "ÙŠÙ…ÙƒÙ† Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø§Ù„Ù…ÙØªØ§Ø ÙÙŠ Ø§Ù„ØªÙˆÙ‚ÙŠØ¹ Ùˆ Ø§Ù„ØªØ¹Ù…ÙŠØ© Ù„ÙƒÙ† Ù„ÙŠØ³ ÙÙŠ Ø§Ù„Ø´Ù‡Ø§Ø¯Ø©."
 
-#: src/gpgmetools.c:1012
+#: src/gpgmetools.c:1015
 msgid "The key can be used only for signing."
 msgstr "ÙŠÙ…ÙƒÙ† Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø§Ù„Ù…ÙØªØ§Ø ÙÙŠ Ø§Ù„ØªÙˆÙ‚ÙŠØ¹ ÙÙ‚Ø·."
 
-#: src/gpgmetools.c:1017
+#: src/gpgmetools.c:1020
 msgid "The key can be used only for encryption."
 msgstr "ÙŠÙ…ÙƒÙ† Ø§Ø³ØªØ®Ø¯Ø§Ù… Ø§Ù„Ù…ÙØªØ§Ø ÙÙŠ Ø§Ù„ØªØ¹Ù…ÙŠØ© ÙÙ‚Ø·."
 
-#: src/gpgmetools.c:1020
+#: src/gpgmetools.c:1023
 msgid "This key is useless."
 msgstr "Ù„Ø§ ÙØ§Ø¦Ø¯Ø© Ù„Ù‡Ø°Ø§ Ø§Ù„Ù…ÙØªØ§Ø."
 
-#: src/gtktools.c:320
+#: src/gtktools.c:48
 msgid "GPA Error"
 msgstr "Ø¹Ø·Ù„ ÙÙŠ GPA"
 
-#: src/helpmenu.c:216
+#: src/helpmenu.c:83
 msgid "About GPA"
 msgstr "Ø¹Ù†Ù’ GPA"
 
-#: src/helpmenu.c:261
-msgid "Brought to you by:"
-msgstr "Ù‚Ø¯Ù‘Ù…Ù‡ Ù„Ùƒ:"
+#: src/helpmenu.c:89
+#, fuzzy
+msgid "GPA is the GNU Privacy Assistant."
+msgstr "Ø´Ø±Ø Ù…Ø³Ø§Ø¹Ø¯ Ø®ØµÙˆØµÙŠØ© Ø¬Ù†Ùˆ"
 
-#: src/helpmenu.c:298
-msgid "GPA is Free Software under the"
-msgstr "â€GPA Ø¨Ø±Ù…Ø¬ÙŠØ© ØØ±Ù‘Ø© ØªØØª"
+#: src/icons.c:199
+#, fuzzy
+msgid "_Verify"
+msgstr "ØªØÙ‚Ù‚"
 
-#: src/helpmenu.c:302
-msgid "GNU General Public License."
-msgstr "Ø±Ø®ØµØ© Ø¬Ù†Ùˆ Ø§Ù„Ø¹Ù…ÙˆÙ…ÙŠØ© Ø§Ù„Ø¹Ø§Ù…Ø©."
+#: src/icons.c:200
+#, fuzzy
+msgid "_Encrypt"
+msgstr "Ø¹Ù…Ù‘"
 
-#: src/helpmenu.c:306
-msgid "For news see:"
-msgstr "Ù„Ù„Ø£Ø®Ø¨Ø§Ø± Ø±Ø§Ø¬Ø¹:"
+#: src/icons.c:201
+#, fuzzy
+msgid "_Decrypt"
+msgstr "Ø¸Ù‡Ù‘ÙØ±"
 
-#: src/helpmenu.c:311
-msgid "http://www.gpg4win.org"
-msgstr "http://www.gpg4win.org"
+#: src/icons.c:202
+#, fuzzy
+msgid "_Brief"
+msgstr "Ù…ÙˆØ¬Ø²Ø©"
 
-#: src/helpmenu.c:313
-msgid "http://www.gnupg.org"
-msgstr "http://www.gnupg.org"
+#: src/icons.c:203
+#, fuzzy
+msgid "_Detailed"
+msgstr "Ù…ÙØµÙ‘ÙŽÙ„Ø©"
 
-#: src/helpmenu.c:396
-msgid "GNU General Public License"
-msgstr "Ø±Ø®ØµØ© Ø¬Ù†Ùˆ Ø§Ù„Ø¹Ù…ÙˆÙ…ÙŠØ© Ø§Ù„Ø¹Ø§Ù…Ø©"
+#: src/icons.c:204
+#, fuzzy
+msgid "_Keyring Editor"
+msgstr "Ù…ØØ±Ø± ØÙ„Ù‚Ø© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
 
-#: src/helpmenu.c:423
-msgid "_GNU General Public License"
-msgstr "Ø±Ø®ØµØ© _Ø¬Ù†Ùˆ Ø§Ù„Ø¹Ù…ÙˆÙ…ÙŠØ© Ø§Ù„Ø¹Ø§Ù…Ø©"
+#: src/icons.c:205
+#, fuzzy
+msgid "_Clipboard"
+msgstr "Ø§Ù„ØØ§ÙØ¸Ø©"
 
-#: src/helpmenu.c:450
-msgid "Show Help Text\n"
-msgstr "Ø§Ø¹Ø±Ø¶ Ù†Øµ Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©\n"
+#: src/icons.c:206
+#, fuzzy
+msgid "_File Manager"
+msgstr "Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: src/helpmenu.c:458
-msgid "/_Help"
-msgstr "/_Ù…Ø³Ø§Ø¹Ø¯Ø©"
-
-#: src/helpmenu.c:460
-msgid "/Help/_Contents"
-msgstr "/Ù…Ø³Ø§Ø¹Ø¯Ø©/Ø§Ù„_Ù…ØØªÙˆÙŠØ§Øª"
-
-#: src/helpmenu.c:463
-msgid "/Help/_License"
-msgstr "/Ù…Ø³Ø§Ø¹Ø¯Ø©/Ø§Ù„_Ø±Ø®ØµØ©"
-
-#: src/helpmenu.c:464
-msgid "/Help/_About"
-msgstr "/Ù…Ø³Ø§Ø¹Ø¯Ø©/_Ø¹Ù†Ù’"
-
 #: src/keydeletedlg.c:41
 msgid "Removing Secret Key"
 msgstr "ÙŠØ¬Ø±ÙŠ ØØ°Ù Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø³Ø±Ù‘ÙŠ"
@@ -1224,23 +1001,28 @@
 msgid "Are you sure you want to delete this key?"
 msgstr "Ø£Ù…ØªØ£ÙƒØ¯ Ø£Ù†Ùƒ ØªØ±ÙŠØ¯ ØØ°Ù Ù‡Ø°Ø§ Ø§Ù„Ù…ÙØªØ§ØØŸ"
 
-#: src/keyeditdlg.c:149
+#: src/keyeditdlg.c:147
 msgid "Edit Key"
 msgstr "ØØ±Ø± Ø§Ù„Ù…ÙØªØ§Ø"
 
-#: src/keyeditdlg.c:165
+#: src/keyeditdlg.c:162
 msgid "Change _passphrase"
 msgstr "ØºÙŠÙ‘Ø± _Ø¹Ø¨Ø§Ø±Ø© Ø§Ù„Ø³Ø±"
 
-#: src/keyeditdlg.c:185
+#: src/keyeditdlg.c:182
 msgid "Change _expiration"
 msgstr "ØºÙŠÙ‘Ø± _ØªØ§Ø±ÙŠØ® Ø§Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: src/keygendlg.c:58
+#: src/keygendlg.c:67
+#, fuzzy
+msgid "You must enter a key size."
+msgstr "ÙŠØ¬Ø¨ Ø£Ù† ØªÙØ¯Ø®ÙÙ„ Ù‡ÙˆÙŠØ© Ù…ÙØ³ØªØ®Ø¯Ù…."
+
+#: src/keygendlg.c:72
 msgid "You must enter a User ID."
 msgstr "ÙŠØ¬Ø¨ Ø£Ù† ØªÙØ¯Ø®ÙÙ„ Ù‡ÙˆÙŠØ© Ù…ÙØ³ØªØ®Ø¯Ù…."
 
-#: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
+#: src/keygendlg.c:77 src/passwddlg.c:45
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -1248,7 +1030,7 @@
 "ÙÙŠ \"Ø¹Ø¨Ø§Ø±Ø© Ø§Ù„Ø³Ø±\" Ùˆ \"ÙƒØ±Ø± Ø¹Ø¨Ø§Ø±Ø© Ø§Ù„Ø³Ø±\"ØŒ\n"
 "ÙŠØ¬Ø¨ Ø£Ù† ØªÙØ¯Ø®ÙÙ„ Ø¹Ø¨Ø§Ø±Ø© Ø§Ù„Ø³Ø± Ø°Ø§ØªÙ‡Ø§."
 
-#: src/keygendlg.c:70 src/keygenwizard.c:314 src/passwddlg.c:52
+#: src/keygendlg.c:84 src/passwddlg.c:52
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1256,7 +1038,7 @@
 "Ù„Ù… ØªÙØ¯Ø®Ù„ Ø¹Ø¨Ø§Ø±Ø© Ø³Ø±.\n"
 "ØªØØªØ§Ø¬Ù‡Ø§ Ù„ØÙ…Ø§ÙŠØ© Ù…ÙØªØ§ØÙƒ Ø§Ù„Ø³Ø±Ù‘ÙŠ."
 
-#: src/keygendlg.c:83 src/keygenwizard.c:328 src/passwddlg.c:65
+#: src/keygendlg.c:97 src/passwddlg.c:65
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1267,23 +1049,25 @@
 "\n"
 "Ù…Ù† ÙØ¶Ù„Ùƒ Ø£Ø¯Ø®Ù„ Ø¹Ø¨Ø§Ø±Ø© Ø³Ø± Ø¬Ø¯ÙŠØ¯Ø©."
 
-#: src/keygendlg.c:88 src/keygenwizard.c:333 src/passwddlg.c:70
+#: src/keygendlg.c:102 src/passwddlg.c:70
 msgid "_Enter new passphrase"
 msgstr "Ø£_Ø¯Ø®Ù„ Ø¹Ø¨Ø§Ø±Ø© Ø³Ø± Ø¬Ø¯ÙŠØ¯Ø©"
 
-#: src/keygendlg.c:89 src/keygenwizard.c:334 src/passwddlg.c:71
+#: src/keygendlg.c:104 src/passwddlg.c:71
 msgid "Take this one _anyway"
 msgstr "Ø§Ø³ØªØ®Ø¯Ù… Ù‡Ø°Ù‡ Ø¹Ù„Ù‰ Ø£ÙŠ _ØØ§Ù„"
 
-#: src/keygendlg.c:144 src/keygenwizard.c:541
+#: src/keygendlg.c:150 src/keygenwizard.c:571 src/keygenwizard.c:584
+#: src/keygenwizard.c:594 src/keygenwizard.c:604 src/keygenwizard.c:616
+#: src/keygenwizard.c:633 src/keygenwizard.c:645
 msgid "Generate key"
 msgstr "ÙˆÙ„Ù‘Ø¯ Ù…ÙØªØ§ØØ§"
 
-#: src/keygendlg.c:185
+#: src/keygendlg.c:177
 msgid "_Algorithm: "
 msgstr "Ø§Ù„_Ø®ÙˆØ§Ø±Ø²Ù…ÙŠØ©:"
 
-#: src/keygendlg.c:197
+#: src/keygendlg.c:192
 msgid "_Key size (bits): "
 msgstr "Ø·ÙˆÙ„ Ø§Ù„_Ù…ÙØªØ§Ø (Ø¨ØªÙ‘Ø§Øª):"
 
@@ -1299,27 +1083,27 @@
 msgid "2048"
 msgstr "2048"
 
-#: src/keygendlg.c:216
+#: src/keygendlg.c:206
 msgid "_User ID: "
 msgstr "_Ù‡ÙˆÙŠÙ‘Ø© Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…: "
 
-#: src/keygendlg.c:226
+#: src/keygendlg.c:217
 msgid "_Email: "
 msgstr "Ø§Ù„_Ø¨Ø±ÙŠØ¯: "
 
-#: src/keygendlg.c:236
+#: src/keygendlg.c:226
 msgid "_Comment: "
 msgstr "Ø§Ù„_ØªØ¹Ù„ÙŠÙ‚: "
 
-#: src/keygendlg.c:248
+#: src/keygendlg.c:235
 msgid "_Passphrase: "
 msgstr "_Ø¹Ø¨Ø§Ø±Ø© Ø§Ù„Ø³Ø±: "
 
-#: src/keygendlg.c:260
+#: src/keygendlg.c:246
 msgid "_Repeat passphrase: "
 msgstr "_ÙƒØ±Ø± Ø¹Ø¨Ø§Ø±Ø© Ø§Ù„Ø³Ø±: "
 
-#: src/keygenwizard.c:152
+#: src/keygenwizard.c:172
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1330,19 +1114,16 @@
 "\n"
 "Ø³ÙŠÙƒÙˆÙ† Ø§Ø³Ù…Ùƒ Ø¬Ø²Ø¡Ø§ Ù…Ù† Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø¬Ø¯ÙŠØ¯ Ù„ÙŠØ³Ù‡Ù„ Ø¹Ù„Ù‰ Ø§Ù„Ø¢Ø®Ø±ÙŠÙ† Ø§Ù„ØªØ¹Ø±Ù Ø¹Ù„ÙŠÙ‡."
 
-#: src/keygenwizard.c:157
+#: src/keygenwizard.c:175
 msgid "Your Name:"
 msgstr "Ø§Ø³Ù…Ùƒ:"
 
-#: src/keygenwizard.c:170
-msgid "Please insert your name"
-msgstr "Ø£Ø¯Ø®Ù„ Ø§Ø³Ù…Ùƒ"
-
-#: src/keygenwizard.c:183
+#: src/keygenwizard.c:211
+#, fuzzy
 msgid ""
 "Please insert your email address.\n"
 "\n"
-" Your email address will be part of the new key to make it easier for others "
+"Your email address will be part of the new key to make it easier for others "
 "to identify keys. If you have several email addresses, you can add further "
 "email adresses later."
 msgstr ""
@@ -1351,27 +1132,40 @@
 "Ø³ÙŠÙƒÙˆÙ† Ø¹Ù†ÙˆØ§Ù† Ø¨Ø±ÙŠØ¯Ùƒ Ø¬Ø²Ø¡Ø§ Ù…Ù† Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø¬Ø¯ÙŠØ¯ Ù„ÙŠØ³Ù‡Ù„ Ø¹Ù„Ù‰ Ø§Ù„Ø¢Ø®Ø±ÙŠÙ† Ø§Ù„ØªØ¹Ø±Ù Ø¹Ù„ÙŠÙ‡. Ø¥Ø°Ø§ "
 "ÙƒØ§Ù† Ù„Ø¯ÙŠÙƒ Ø£ÙƒØ«Ø± Ù…Ù† Ø¹Ù†ÙˆØ§Ù† Ø¨Ø±ÙŠØ¯ÙŠØŒ ÙŠÙ…ÙƒÙ†Ùƒ Ø¥Ø¶Ø§ÙØ© Ø§Ù„Ù…Ø²ÙŠØ¯ Ù„Ø§ØÙ‚Ø§."
 
-#: src/keygenwizard.c:190
+#: src/keygenwizard.c:215
 msgid "Your Email Address:"
 msgstr "Ø¹Ù†ÙˆØ§Ù† Ø¨Ø±ÙŠØ¯Ùƒ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ:"
 
-#: src/keygenwizard.c:205
-msgid "Please insert your email address"
-msgstr "Ø£Ø¯Ø®Ù„ Ø¹Ù†ÙˆØ§Ù† Ø¨Ø±ÙŠØ¯Ùƒ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ"
-
-#: src/keygenwizard.c:239
+#: src/keygenwizard.c:319
 msgid "Please choose a passphrase for the new key."
 msgstr "Ø£Ø¯Ø®Ù„ Ø¹Ø¨Ø§Ø±Ø© Ø³Ø± Ù„Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø¬Ø¯ÙŠØ¯."
 
-#: src/keygenwizard.c:248 src/passwddlg.c:108
+#: src/keygenwizard.c:326
+#, fuzzy
+msgid ""
+"In \"Passphrase\" and \"Repeat passphrase\", you must enter the same "
+"passphrase."
+msgstr ""
+"ÙÙŠ \"Ø¹Ø¨Ø§Ø±Ø© Ø§Ù„Ø³Ø±\" Ùˆ \"ÙƒØ±Ø± Ø¹Ø¨Ø§Ø±Ø© Ø§Ù„Ø³Ø±\"ØŒ\n"
+"ÙŠØ¬Ø¨ Ø£Ù† ØªÙØ¯Ø®ÙÙ„ Ø¹Ø¨Ø§Ø±Ø© Ø§Ù„Ø³Ø± Ø°Ø§ØªÙ‡Ø§."
+
+#: src/keygenwizard.c:335
+msgid "Warning: The passphrase you have entered is not very secure."
+msgstr ""
+
+#: src/keygenwizard.c:350
+msgid "Quality: "
+msgstr ""
+
+#: src/keygenwizard.c:358 src/passwddlg.c:111
 msgid "Passphrase: "
 msgstr "Ø¹Ø¨Ø§Ø±Ø© Ø§Ù„Ø³Ø±: "
 
-#: src/keygenwizard.c:261 src/passwddlg.c:117
+#: src/keygenwizard.c:370 src/passwddlg.c:120
 msgid "Repeat Passphrase: "
 msgstr "ÙƒØ±Ø± Ø¹Ø¨Ø§Ø±Ø© Ø§Ù„Ø³Ø±: "
 
-#: src/keygenwizard.c:358
+#: src/keygenwizard.c:412
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1382,15 +1176,15 @@
 "\n"
 "Ø£ØªØ±ÙŠØ¯ Ø£Ø®Ø° Ù†Ø³Ø®Ø© Ø§ØØªÙŠØ§Ø·ÙŠØ© Ø§Ù„Ø¢Ù†ØŸ"
 
-#: src/keygenwizard.c:367
+#: src/keygenwizard.c:420
 msgid "Create _backup copy"
 msgstr "Ø®ÙØ° _Ù†Ø³Ø®Ø© Ø§ØØªÙŠØ§Ø·ÙŠØ©"
 
-#: src/keygenwizard.c:374 src/keyring.c:739 src/keyring.c:767
+#: src/keygenwizard.c:425 src/keyring.c:737 src/keyring.c:763
 msgid "Do it _later"
 msgstr "_Ù„Ø§ØÙ‚Ø§"
 
-#: src/keygenwizard.c:402
+#: src/keygenwizard.c:454
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1400,7 +1194,7 @@
 "\n"
 "Ù‚Ø¯ ÙŠØ³ØªØºØ±Ù‚ Ù‡Ø°Ø§ Ø¨Ø¹Ø¶ Ø§Ù„ÙˆÙ‚Øª ØØªÙ‰ Ø¹Ù„Ù‰ Ø§Ù„ØÙˆØ§Ø³ÙŠØ¨ Ø§Ù„Ø³Ø±ÙŠØ¹Ø©. Ø§ØµØ¨Ø±."
 
-#: src/keygenwizard.c:411
+#: src/keygenwizard.c:463
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1419,25 +1213,25 @@
 "ÙŠÙØ¹ÙŠØ¯ GnuPG Ø¨Ù†Ø§Ø¡ Ù‚Ø§Ø¹Ø¯Ø© Ø¨ÙŠØ§Ù†Ø§Øª Ø§Ù„Ø«Ù‚Ø©.\n"
 "Ù‚Ø¯ ÙŠØ³ØªØºØ±Ù‚ Ù‡Ø°Ø§ Ø¨Ø¶Ø¹ Ø¯Ù‚Ø§Ø¦Ù‚."
 
-#: src/keylist.c:559
+#: src/keylist.c:547
 msgid ""
 "This columns lists the type of the certificate.  A 'P' denotes OpenPGP and a "
 "'X' denotes X.509 (S/MIME)."
 msgstr ""
 
-#: src/keylist.c:568
+#: src/keylist.c:556
 msgid "The key ID is a short number to identify a certificate."
 msgstr "Ù…ÙØ¹Ø±Ù‘Ù Ø§Ù„Ù…ÙØªØ§Ø Ù‡Ùˆ Ø±Ù‚Ù… ØµØºÙŠØ± Ù„ØªØ¹Ø±ÙŠÙ Ø§Ù„Ø´Ù‡Ø§Ø¯Ø©."
 
-#: src/keylist.c:581
+#: src/keylist.c:569
 msgid "The Expiry Date is the date until the certificate is valid."
 msgstr "ØªØ§Ø±ÙŠØ® Ø§Ù„Ø§Ù†ØªÙ‡Ø§Ø¡ Ù‡Ùˆ Ø§Ù„ØªØ§Ø±ÙŠØ® Ø§Ù„Ø°ÙŠ ØªÙ†ØªÙ‡ÙŠ Ø¹Ù†Ø¯Ù‡ ØµÙ„Ø§ØÙŠØ© Ø§Ù„Ø´Ù‡Ø§Ø¯Ø©."
 
-#: src/keylist.c:591 src/ownertrustdlg.c:122
+#: src/keylist.c:579 src/ownertrustdlg.c:123
 msgid "Owner Trust"
 msgstr "Ø§Ù„Ø«Ù‚Ø© ÙÙŠ Ø§Ù„Ù…Ø§Ù„Ùƒ"
 
-#: src/keylist.c:592
+#: src/keylist.c:580
 msgid ""
 "The Owner Trust has been set by you and describes how far you trust the "
 "holder of the certificate to correctly sign (certify) other certificates.  "
@@ -1446,11 +1240,11 @@
 "Ù„Ù‚Ø¯ ÙˆÙØ¶ÙØ¹Øª Ø§Ù„Ø«Ù‚Ø© ÙÙŠ Ø§Ù„Ù…Ø§Ù„Ùƒ Ù…Ù† Ù‚ÙØ¨Ù„Ùƒ ÙˆØªÙˆØ¶Ù‘Ø Ø¥Ù„Ù‰ Ø£ÙŠ Ù…Ø¯Ù‰ ØªØ«Ù‚ ÙÙŠ ØØ§Ù…Ù„ Ø§Ù„Ø´Ù‡Ø§Ø¯Ø© Ù„ÙŠÙˆÙ‚Ù‘Ø¹ "
 "(ÙŠÙØ¬ÙŠØ²) Ø§Ù„Ø´Ù‡Ø§Ø¯Ø§Øª Ø§Ù„Ø£Ø®Ø±Ù‰.  Ù„Ù‡Ø°Ø§ Ù…Ø¹Ù†Ù‰ Ø¨Ø§Ù„Ù†Ø³Ø¨Ø© Ø¥Ù„Ù‰ OpenGPG ÙÙ‚Ø·."
 
-#: src/keylist.c:604
+#: src/keylist.c:592
 msgid "Validity"
 msgstr "Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: src/keylist.c:605
+#: src/keylist.c:593
 msgid ""
 "The Validity describes the trust level the system has in this certificate.  "
 "That is how sure it is that the named user is actually that user."
@@ -1458,7 +1252,7 @@
 "ØªØµÙ Ø§Ù„ØµÙ„Ø§ØÙŠØ© Ù…Ø³ØªÙˆÙ‰ Ø«Ù‚Ø© Ø§Ù„Ù†Ø¸Ø§Ù… ÙÙŠ Ù‡Ø°Ù‡ Ø§Ù„Ø´Ù‡Ø§Ø¯Ø©.  Ù‡Ø°Ø§ Ù‡Ùˆ Ù…Ø¯Ù‰ Ø§Ù„Ø«Ù‚Ø© ÙÙŠ Ø£Ù† "
 "Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… Ø§Ù„Ù…Ø°ÙƒÙˆØ± Ù‡Ùˆ Ù…Ù† ÙŠÙƒÙˆÙ†."
 
-#: src/keylist.c:619
+#: src/keylist.c:607
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
@@ -1468,17 +1262,17 @@
 msgid "No keys selected for signing."
 msgstr "Ù„Ù… ØªÙØØ¯Ø¯ Ø£ÙŠ Ù…ÙØ§ØªÙŠØ Ù„Ù„ØªØ¹Ù…ÙŠØ©."
 
-#: src/keyring.c:734
+#: src/keyring.c:732
 msgid ""
 "You do not have a private key yet. Do you want to generate one now "
 "(recommended) or do it later?"
 msgstr "Ù„ÙŠØ³ Ù„Ø¯ÙŠÙƒ Ù…ÙØªØ§Ø Ø³Ø±ÙŠ. Ø£ØªØ±ÙŠØ¯ ØªÙˆÙ„ÙŠØ¯ ÙˆØ§ØØ¯ Ø§Ù„Ø¢Ù† (Ù…ØØ¨Ø°) Ø£Ù… Ø§Ù„Ù‚ÙŠØ§Ù… Ø¨Ù‡Ø°Ø§ Ù„Ø§ØÙ‚Ø§ØŸ"
 
-#: src/keyring.c:738
+#: src/keyring.c:736
 msgid "_Generate key now"
 msgstr "_ÙˆÙ„Ù‘ÙØ¯ Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø¢Ù†"
 
-#: src/keyring.c:761
+#: src/keyring.c:757
 msgid ""
 "You do not have a backup copy of your private key yet. Do you want to backup "
 "your key now (recommended) or do it later?"
@@ -1486,216 +1280,209 @@
 "Ù„Ù… ØªØªØ®Ø° Ù†Ø³Ø®Ø© Ø§ØØªÙŠØ§Ø·ÙŠØ© Ù…Ù† Ù…ÙØªØ§ØÙƒ Ø§Ù„Ø³Ø±ÙŠ Ø¨Ø¹Ø¯. Ø£ØªØ±ÙŠØ¯ Ø£Ø®Ø° Ù†Ø³Ø®Ø© Ø§ØØªÙŠØ§Ø·ÙŠØ© Ø§Ù„Ø¢Ù† "
 "(Ù…ØØ¨Ø°) Ø£Ù… Ø§Ù„Ù‚ÙŠØ§Ù… Ø¨Ù‡Ø°Ø§ Ù„Ø§ØÙ‚Ø§ØŸ"
 
-#: src/keyring.c:766
+#: src/keyring.c:762
 msgid "_Backup key now"
 msgstr "Ø§_ØÙØ¸ Ø§Ù„Ù…ÙØªØ§Ø Ø§ØØªÙŠØ§Ø·ÙŠØ§ Ø§Ù„Ø¢Ù†"
 
-#: src/keyring.c:883
-msgid "/_Keys"
+#: src/keyring.c:886
+#, fuzzy
+msgid "_Keys"
 msgstr "/Ø§Ù„_Ù…ÙØ§ØªÙŠØ"
 
-#: src/keyring.c:884
-msgid "/Keys/_Refresh"
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/_ØØ¯Ù‘Ø«"
-
-#: src/keyring.c:886
-msgid "/Keys/sep0"
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/sep0"
-
 #: src/keyring.c:887
-msgid "/Keys/_New Key..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/Ù…ÙØªØ§Ø _Ø¬Ø¯ÙŠØ¯"
+#, fuzzy
+msgid "_Server"
+msgstr "/Ø§Ù„_Ø®Ø§Ø¯ÙˆÙ…"
 
-#: src/keyring.c:889
-msgid "/Keys/_Delete Keys..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/Ø§_ØØ°Ù Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+#: src/keyring.c:901
+msgid "Select all certificates"
+msgstr ""
 
-#: src/keyring.c:891
-msgid "/Keys/sep1"
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/sep1"
+#: src/keyring.c:906
+msgid "Refresh the keyring"
+msgstr "ÙŠÙ†Ø¹Ø´ ØÙ„Ù‚Ø© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
 
-#: src/keyring.c:892
-msgid "/Keys/_Sign Keys..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/_ÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+#: src/keyring.c:907
+#, fuzzy
+msgid "_New key..."
+msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/Ù…ÙØªØ§Ø _Ø¬Ø¯ÙŠØ¯"
 
-#: src/keyring.c:893
-msgid "/Keys/Set _Owner Trust..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/ØØ¯Ø¯ Ø§Ù„_Ø«Ù‚Ø© ÙÙŠ Ø§Ù„Ù…Ø§Ù„Ùƒ..."
+#: src/keyring.c:908
+#, fuzzy
+msgid "Generate a new key"
+msgstr "ÙˆÙ„Ù‘Ø¯ Ù…ÙØªØ§ØØ§"
 
-#: src/keyring.c:894
-msgid "/Keys/_Edit Private Key..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/ØØ±Ù‘_Ø± Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø³Ø±Ù‘ÙŠ..."
+#: src/keyring.c:909
+#, fuzzy
+msgid "_Delete keys"
+msgstr "/Ø§_ØØ°Ù Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
 
-#: src/keyring.c:895
-msgid "/Keys/sep2"
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/sep2"
+#: src/keyring.c:910
+msgid "Remove the selected key"
+msgstr "Ø§ØØ°Ù Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ù…ØØ¯Ø¯"
 
-#: src/keyring.c:896
-msgid "/Keys/_Import Keys..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/Ø§_Ø³ØªÙˆØ±Ø¯ Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+#: src/keyring.c:911
+#, fuzzy
+msgid "_Sign Keys..."
+msgstr "/Ùˆ_Ù‚Ù‘Ø¹ Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
 
-#: src/keyring.c:897
-msgid "/Keys/E_xport Keys..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/_ØµØ¯Ù‘Ø± Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+#: src/keyring.c:912
+msgid "Sign the selected key"
+msgstr "ÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ù…ØØ¯Ø¯"
 
-#: src/keyring.c:898
-msgid "/Keys/_Backup..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/Ø§_ØÙØ¸ Ø§ØØªÙŠØ§Ø·ÙŠØ§..."
+#: src/keyring.c:913
+#, fuzzy
+msgid "Set _Owner Trust..."
+msgstr "/ØØ¯Ù‘Ø¯ Ø§Ù„_Ø«Ù‚Ø© ÙÙŠ Ø§Ù„Ù…Ø§Ù„Ùƒ..."
 
-#: src/keyring.c:901
-msgid "/_Server"
-msgstr "/Ø§Ù„_Ø®Ø§Ø¯ÙˆÙ…"
+#: src/keyring.c:914
+#, fuzzy
+msgid "Set owner trust of the selected key"
+msgstr "Ø§ØØ°Ù Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ù…ØØ¯Ø¯"
 
-#: src/keyring.c:902
-msgid "/Server/_Retrieve Keys..."
-msgstr "/Ø§Ù„Ø®Ø§Ø¯ÙˆÙ…/Ø§Ù„Ù…ÙØ§ØªÙŠØ Ø§Ù„_Ø³Ø±Ù‘ÙŠØ©..."
+#: src/keyring.c:916
+#, fuzzy
+msgid "_Edit Private Key..."
+msgstr "/ØØ±Ù‘_Ø± Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø³Ø±Ù‘ÙŠ..."
 
-#: src/keyring.c:903
-msgid "/Server/_Send Keys..."
-msgstr "/Ø§Ù„Ø®Ø§Ø¯ÙˆÙ…/Ø£_Ø±Ø³ÙÙ„ Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+#: src/keyring.c:917
+msgid "Edit the selected private key"
+msgstr "ØØ±Ù‘Ø± Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø³Ø±ÙŠ Ø§Ù„Ù…ØØ¯Ø¯"
 
-#: src/keyring.c:908
-msgid "/Windows/_File Manager"
-msgstr "/Ù†ÙˆØ§ÙØ°/_Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ù„ÙØ§Øª"
+#: src/keyring.c:919
+#, fuzzy
+msgid "_Import Keys..."
+msgstr "Ø§Ø³ØªÙˆØ±ÙØ¯ Ø§Ù„Ù…ÙØ§ØªÙŠØ"
 
-#: src/keyring.c:939
-msgid "/Keys/Export Keys..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/ØµØ¯Ù‘Ø± Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+#: src/keyring.c:920
+msgid "Import Keys"
+msgstr "Ø§Ø³ØªÙˆØ±ÙØ¯ Ø§Ù„Ù…ÙØ§ØªÙŠØ"
 
-#: src/keyring.c:944
-msgid "/Keys/Delete Keys..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/Ø§ØØ°Ù Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+#: src/keyring.c:921
+#, fuzzy
+msgid "E_xport Keys..."
+msgstr "/_ØµØ¯Ù‘Ø± Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
 
-#: src/keyring.c:952
-msgid "/Server/Send Keys..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/Ø£Ø±Ø³ÙÙ„ Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+#: src/keyring.c:922
+msgid "Export Keys"
+msgstr "ØµØ¯Ù‘Ø± Ø§Ù„Ù…ÙØ§ØªÙŠØ"
 
-#: src/keyring.c:959
-msgid "/Keys/Set Owner Trust..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/ØØ¯Ù‘Ø¯ Ø§Ù„Ø«Ù‚Ø© ÙÙŠ Ø§Ù„Ù…Ø§Ù„Ùƒ..."
+#: src/keyring.c:923
+#, fuzzy
+msgid "_Backup..."
+msgstr "/Ø§ØÙØ¸ Ø§_ØØªÙŠØ§Ø·ÙŠØ§..."
 
-#: src/keyring.c:966
-msgid "/Keys/Sign Keys..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/ÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+#: src/keyring.c:924
+#, fuzzy
+msgid "Backup key"
+msgstr "Ø§_ØÙØ¸ Ø§Ù„Ù…ÙØªØ§Ø Ø§ØØªÙŠØ§Ø·ÙŠØ§ Ø§Ù„Ø¢Ù†"
 
-#: src/keyring.c:972
-msgid "/Keys/Edit Private Key..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/ØØ±Ù‘Ø± Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø³Ø±ÙŠ..."
+#: src/keyring.c:927
+#, fuzzy
+msgid "_Retrieve Keys..."
+msgstr "/Ø§Ù„Ø®Ø§Ø¯ÙˆÙ…/Ø§Ù„Ù…ÙØ§ØªÙŠØ Ø§Ù„_Ø³Ø±Ù‘ÙŠØ©..."
 
-#: src/keyring.c:977
-msgid "/Keys/Backup..."
-msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/Ø§ØÙØ¸ Ø§ØØªÙŠØ§Ø·ÙŠØ§..."
+#: src/keyring.c:928
+msgid "Retrieve keys from server"
+msgstr ""
 
-#: src/keyring.c:994
-msgid "/_Copy"
-msgstr "/Ø§_Ù†Ø³Ø®"
-
-#: src/keyring.c:996
-msgid "/_Paste"
-msgstr "/Ø£_Ù„ØµÙ‚"
-
-#: src/keyring.c:998
-msgid "/_Delete Keys..."
-msgstr "/Ø§_ØØ°Ù Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
-
-#: src/keyring.c:1001
-msgid "/_Sign Keys..."
+#: src/keyring.c:930
+#, fuzzy
+msgid "_Send Keys..."
 msgstr "/Ùˆ_Ù‚Ù‘Ø¹ Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
 
-#: src/keyring.c:1002
-msgid "/Set _Owner Trust..."
-msgstr "/ØØ¯Ù‘Ø¯ Ø§Ù„_Ø«Ù‚Ø© ÙÙŠ Ø§Ù„Ù…Ø§Ù„Ùƒ..."
+#: src/keyring.c:931
+#, fuzzy
+msgid "Send keys to server"
+msgstr "/Ø£Ø±_Ø³ÙÙ„ Ø§Ù„Ù…ÙØ§ØªÙŠØ Ù„Ù„Ø®Ø§Ø¯ÙˆÙ…..."
 
-#: src/keyring.c:1003
-msgid "/_Edit Private Key..."
-msgstr "/ØØ±Ù‘_Ø± Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø³Ø±Ù‘ÙŠ..."
+#: src/keyring.c:937
+msgid "Show Brief Keylist"
+msgstr "ÙŠØ¹Ø±Ø¶ Ù‚Ø§Ø¦Ù…Ø© Ù…ÙØ§ØªÙŠØ Ù…ÙˆØ¬Ø²Ø©"
 
-#: src/keyring.c:1005
-msgid "/E_xport Keys..."
-msgstr "/_ØµØ¯Ù‘Ø± Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+#: src/keyring.c:939
+msgid "Show Key Details"
+msgstr "ÙŠØ¹Ø±Ø¶ ØªÙØ§ØµÙŠÙ„ Ø§Ù„Ù…ÙØ§ØªÙŠØ"
 
-#: src/keyring.c:1006
-msgid "/Se_nd Keys to Server..."
-msgstr "/Ø£Ø±_Ø³ÙÙ„ Ø§Ù„Ù…ÙØ§ØªÙŠØ Ù„Ù„Ø®Ø§Ø¯ÙˆÙ…..."
+#: src/keyring.c:1063
+msgid "Edit"
+msgstr "ØØ±Ù‘Ø±"
 
-#: src/keyring.c:1007
-msgid "/_Backup..."
-msgstr "/Ø§ØÙØ¸ Ø§_ØØªÙŠØ§Ø·ÙŠØ§..."
+#: src/keyring.c:1065
+#, fuzzy
+msgid "Delete"
+msgstr "/ØªØØ±ÙŠØ±/Ø§ØØ°Ù"
 
-#: src/keyring.c:1018
-msgid "/Set Owner Trust..."
-msgstr "/ØØ¯Ø¯ Ø§Ù„Ø«Ù‚Ø© ÙÙŠ Ø§Ù„Ù…Ø§Ù„Ùƒ..."
+#: src/keyring.c:1067
+msgid "Sign"
+msgstr "ÙˆÙ‚Ù‘Ø¹"
 
-#: src/keyring.c:1025
-msgid "/Sign Keys..."
-msgstr "/ÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù…Ù„ÙØ§Øª..."
+#: src/keyring.c:1069
+msgid "Export"
+msgstr "ØµØ¯Ù‘Ø±"
 
-#: src/keyring.c:1031
-msgid "/Edit Private Key..."
-msgstr "/ØØ±Ø± Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø³Ø±ÙŠ..."
+#: src/keyring.c:1071
+msgid "Import"
+msgstr "Ø§Ø³ØªÙˆØ±Ø¯"
 
-#: src/keyring.c:1036
-msgid "/Backup..."
-msgstr "/Ø§ØÙØ¸ Ø§ØØªÙŠØ§Ø·ÙŠØ§..."
-
-#: src/keyring.c:1106
+#: src/keyring.c:1178
 msgid "Subkeys"
 msgstr "Ø§Ù„Ù…ÙØ§ØªÙŠØ Ø§Ù„ÙØ±Ø¹ÙŠØ©"
 
-#: src/keyring.c:1180 src/keysigndlg.c:110
+#: src/keyring.c:1252 src/keysigndlg.c:106
 msgid "Fingerprint:"
 msgstr "Ø§Ù„Ø¨ØµÙ…Ø©:"
 
-#: src/keyring.c:1182
+#: src/keyring.c:1254
 msgid "Expires at:"
 msgstr "ÙŠÙ†ØªÙ‡ÙŠ ÙÙŠ:"
 
-#: src/keyring.c:1184
+#: src/keyring.c:1256
 msgid "Owner Trust:"
 msgstr "Ø§Ù„Ø«Ù‚Ø© ÙÙŠ Ø§Ù„Ù…Ø§Ù„Ùƒ:"
 
-#: src/keyring.c:1186
+#: src/keyring.c:1258
 msgid "Key Validity:"
 msgstr "ØµÙ„Ø§ØÙŠØ© Ø§Ù„Ù…ÙØªØ§Ø:"
 
-#: src/keyring.c:1188
+#: src/keyring.c:1260
 msgid "Key Type:"
 msgstr "Ù†ÙˆØ¹ Ø§Ù„Ù…ÙØªØ§Ø:"
 
-#: src/keyring.c:1190
+#: src/keyring.c:1262
 msgid "Created at:"
 msgstr "Ø£ÙÙ†Ø´Ø¦ ÙÙŠ:"
 
-#: src/keyring.c:1193
+#: src/keyring.c:1265
 msgid "Details"
 msgstr "Ø§Ù„ØªÙØ§ØµÙŠÙ„"
 
-#: src/keyring.c:1201
+#: src/keyring.c:1273
 msgid "Show signatures on user name:"
 msgstr "Ø§Ø¹Ø±Ø¶ Ø§Ù„ØªÙˆÙ‚ÙŠØ¹Ø§Øª Ø¹Ù„Ù‰ Ø§Ø³Ù… Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…:"
 
-#: src/keyring.c:1225
+#: src/keyring.c:1298
 msgid "Signatures"
 msgstr "Ø§Ù„ØªÙˆÙ‚ÙŠØ¹Ø§Øª"
 
-#: src/keyring.c:1249
+#: src/keyring.c:1322
 msgid "The key has both a private and a public part"
 msgstr "Ù„Ù„Ù…ÙØªØ§Ø Ø¬Ø²Ø¡Ø§Ù†Ø› Ø³Ø±Ù‘ÙŠ ÙˆØ¹Ù„Ù†ÙŠ"
 
-#: src/keyring.c:1252
+#: src/keyring.c:1325
 msgid "The key has only a public part"
 msgstr "Ù„Ù‡Ø°Ø§ Ø§Ù„Ù…ÙØªØ§Ø Ø¬Ø²Ø¡ Ø¹Ù„Ù†ÙŠ ÙÙ‚Ø·"
 
-#: src/keyring.c:1287
+#: src/keyring.c:1360
 #, c-format
 msgid "%s %u bits"
 msgstr "%s %u Ø¨ØªÙ‘Ø©"
 
-#: src/keyring.c:1312
+#: src/keyring.c:1385
 msgid "No keys selected"
 msgstr "Ù„Ù… ØªÙØØ¯Ø¯ Ø£ÙŠ Ù…ÙØ§ØªÙŠØ"
 
-#: src/keyring.c:1315
+#: src/keyring.c:1388
 #, c-format
 msgid "%d key selected"
 msgid_plural "%d keys selected"
@@ -1706,137 +1493,53 @@
 msgstr[4] "ØÙØ¯Ù‘ÙØ¯ %d Ù…ÙØªØ§ØÙ‹Ø§"
 msgstr[5] "ØÙØ¯Ù‘ÙØ¯ %d Ù…ÙØªØ§Ø"
 
-#: src/keyring.c:1347
+#: src/keyring.c:1423
 msgid "All signatures"
 msgstr "ÙƒÙ„ Ø§Ù„ØªÙˆÙ‚ÙŠØ¹Ø§Øª"
 
-#: src/keyring.c:1552
-msgid "Edit"
-msgstr "ØØ±Ù‘Ø±"
-
-#: src/keyring.c:1553
-msgid "Edit the selected private key"
-msgstr "ØØ±Ù‘Ø± Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø³Ø±ÙŠ Ø§Ù„Ù…ØØ¯Ø¯"
-
-#: src/keyring.c:1554
-msgid "edit key"
-msgstr "ØØ±Ù‘Ø± Ø§Ù„Ù…ÙØªØ§Ø"
-
-#: src/keyring.c:1562
-msgid "Remove the selected key"
-msgstr "Ø§ØØ°Ù Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ù…ØØ¯Ø¯"
-
-#: src/keyring.c:1563
-msgid "remove key"
-msgstr "Ø§ØØ°Ù Ø§Ù„Ù…ÙØªØ§Ø"
-
-#: src/keyring.c:1571
-msgid "Sign the selected key"
-msgstr "ÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ù…ØØ¯Ø¯"
-
-#: src/keyring.c:1571
-msgid "sign key"
-msgstr "ÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù…ÙØªØ§Ø"
-
 #: src/keyring.c:1578
-msgid "Import"
-msgstr "Ø§Ø³ØªÙˆØ±Ø¯"
-
-#: src/keyring.c:1579
-msgid "Import Keys"
-msgstr "Ø§Ø³ØªÙˆØ±ÙØ¯ Ø§Ù„Ù…ÙØ§ØªÙŠØ"
-
-#: src/keyring.c:1579
-msgid "import keys"
-msgstr "Ø§Ø³ØªÙˆØ±ÙØ¯ Ø§Ù„Ù…ÙØ§ØªÙŠØ"
-
-#: src/keyring.c:1584
-msgid "Export"
-msgstr "ØµØ¯Ù‘Ø±"
-
-#: src/keyring.c:1585
-msgid "Export Keys"
-msgstr "ØµØ¯Ù‘Ø± Ø§Ù„Ù…ÙØ§ØªÙŠØ"
-
-#: src/keyring.c:1585
-msgid "export keys"
-msgstr "ØµØ¯Ù‘Ø± Ø§Ù„Ù…ÙØ§ØªÙŠØ"
-
-#: src/keyring.c:1598
-msgid "Brief"
-msgstr "Ù…ÙˆØ¬Ø²Ø©"
-
-#: src/keyring.c:1598
-msgid "Show Brief Keylist"
-msgstr "ÙŠØ¹Ø±Ø¶ Ù‚Ø§Ø¦Ù…Ø© Ù…ÙØ§ØªÙŠØ Ù…ÙˆØ¬Ø²Ø©"
-
-#: src/keyring.c:1599
-msgid "brief"
-msgstr "Ù…ÙˆØ¬Ø²Ø©"
-
-#: src/keyring.c:1610
-msgid "Detailed"
-msgstr "Ù…ÙØµÙ‘ÙŽÙ„Ø©"
-
-#: src/keyring.c:1610
-msgid "Show Key Details"
-msgstr "ÙŠØ¹Ø±Ø¶ ØªÙØ§ØµÙŠÙ„ Ø§Ù„Ù…ÙØ§ØªÙŠØ"
-
-#: src/keyring.c:1611
-msgid "detailed"
-msgstr "Ù…ÙÙØµÙ‘ÙŽÙ„Ø©"
-
-#: src/keyring.c:1639
-msgid "Refresh the keyring"
-msgstr "ÙŠÙ†Ø¹Ø´ ØÙ„Ù‚Ø© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
-
-#: src/keyring.c:1640
-msgid "refresh keyring"
-msgstr "Ø£Ù†Ø¹Ø´ ØÙ„Ù‚Ø© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
-
-#: src/keyring.c:1711
 msgid "Selected default key:"
 msgstr "Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ù…ØØ¯Ø¯ Ø¨Ø¯Ø¦ÙŠØ§:"
 
-#: src/keyring.c:1721
+#: src/keyring.c:1588
 msgid "No default key selected in the preferences."
 msgstr "Ù„Ù… ÙŠØØ¯Ø¯ Ø£ÙŠ Ù…ÙØªØ§Ø Ø¨Ø¯Ø¦ÙŠØ§ ÙÙŠ Ø§Ù„ØªÙØ¶ÙŠÙ„Ø§Øª."
 
-#: src/keyring.c:1833
+#: src/keyring.c:1701
 msgid "GNU Privacy Assistant - Keyring Editor"
 msgstr "Ù…Ø³Ø§Ø¹Ø¯ Ø®ØµÙˆØµÙŠØ© Ø¬Ù†Ùˆ - Ù…ØØ±Ø± ØÙ„Ù‚Ø© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
 
-#: src/keyring.c:1865
+#: src/keyring.c:1728
 msgid "Keyring Editor"
 msgstr "Ù…ØØ±Ø± ØÙ„Ù‚Ø© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
 
-#: src/keysigndlg.c:60
+#: src/keysigndlg.c:59
 msgid "Sign Key"
 msgstr "ÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù…ÙØªØ§Ø"
 
-#: src/keysigndlg.c:76
+#: src/keysigndlg.c:72
 msgid "Do you want to sign the following key?"
 msgstr "Ø£ØªØ±ÙŠØ¯ ØªÙˆÙ‚ÙŠØ¹ Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„ØªØ§Ù„ÙŠØŸ"
 
-#: src/keysigndlg.c:120
+#: src/keysigndlg.c:116
 msgid ""
 "Check the name and fingerprint carefully to be sure that it really is the "
 "key you want to sign."
 msgstr "Ø±Ø§Ø¬Ø¹ Ø§Ù„Ø§Ø³Ù… ÙˆØ§Ù„Ø¨ØµÙ…Ø© Ø¨ØÙØ±Øµ ÙˆØªØ£ÙƒØ¯ Ù…Ù† Ø£Ù†Ù‡ ÙØ¹Ù„Ø§ Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø°ÙŠ ØªØ±ÙŠØ¯ ØªÙˆÙ‚ÙŠØ¹Ù‡."
 
-#: src/keysigndlg.c:128
+#: src/keysigndlg.c:124
 msgid "All user names in this key will be signed."
 msgstr "Ø³ØªÙÙˆÙ‚Ù‘Ø¹ ÙƒÙ„ Ø£Ø³Ù…Ø§Ø¡ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ† ÙÙŠ Ù‡Ø°Ø§ Ø§Ù„Ù…ÙØªØ§Ø."
 
-#: src/keysigndlg.c:134
+#: src/keysigndlg.c:130
 msgid "The key will be signed with your default private key."
 msgstr "Ø³ÙŠÙÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù…ÙØªØ§Ø Ø¨Ù…ÙØªØ§ØÙƒ Ø§Ù„Ø³Ø±Ù‘ÙŠ Ø§Ù„Ø¨Ø¯Ø¦ÙŠ."
 
-#: src/keysigndlg.c:141
+#: src/keysigndlg.c:137
 msgid "Sign only _locally"
 msgstr "ÙˆÙ‚Ù‘Ø¹ _Ù…ØÙ„ÙŠÙ‘Ø§ ÙÙ‚Ø·"
 
-#: src/options.c:312
+#: src/options.c:323
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -1844,34 +1547,34 @@
 "Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø³Ø±ÙŠ Ø§Ù„Ø°ÙŠ Ø§Ø®ØªØ±ØªÙ‡ Ù„ÙŠÙƒÙˆÙ† Ø¨Ø¯Ø¦ÙŠØ§ Ù„Ù… ÙŠØ¹Ø¯ Ù…ÙˆØ¬ÙˆØ¯Ø§.\n"
 "Ø³ÙŠØØ§ÙˆÙ„ GPA Ø§Ø®ØªÙŠØ§Ø± Ù…ÙØªØ§Ø Ø¨Ø¯Ø¦ÙŠ Ø¢Ø®Ø± ØªÙ„Ù‚Ø§Ø¦ÙŠØ§."
 
-#: src/ownertrustdlg.c:106
+#: src/ownertrustdlg.c:107
 msgid "Change key ownertrust"
 msgstr "ØºÙŠÙ‘Ø± Ø§Ù„Ø«Ù‚Ø© ÙÙŠ Ø§Ù„Ù…Ø§Ù„Ùƒ"
 
-#: src/ownertrustdlg.c:130
+#: src/ownertrustdlg.c:131
 msgid "_Unknown"
 msgstr "Ù…_Ø¬Ù‡ÙˆÙ„Ø©"
 
-#: src/ownertrustdlg.c:135
+#: src/ownertrustdlg.c:136
 msgid ""
 "You don't know how much to trust this user to verify other people's keys.\n"
 msgstr "Ù„Ø§ ØªØ¹Ø±Ù Ø¯Ø±Ø¬Ø© Ø§Ù„Ø«Ù‚Ø© ÙÙŠ Ù‡Ø°Ø§ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… ÙÙŠ Ø§Ù„ØªØÙ‚Ù‚ Ù…Ù† Ù…ÙØ§ØªÙŠØ Ø§Ù„Ø¢Ø®Ø±ÙŠÙ†.\n"
 
-#: src/ownertrustdlg.c:145
+#: src/ownertrustdlg.c:146
 msgid "_Never"
 msgstr "_Ù…Ù†Ø¹Ø¯Ù…Ø©"
 
-#: src/ownertrustdlg.c:150
+#: src/ownertrustdlg.c:151
 msgid ""
 "You don't trust this user at all to verify the validity of other people's "
 "keys at all.\n"
 msgstr "Ù„Ø³Øª ØªØ«Ù‚ Ø¨ØªØ§ØªØ§ ÙÙŠ Ù‡Ø°Ø§ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… ÙÙŠ Ø§Ù„ØªØÙ‚Ù‚ Ù…Ù† Ù…ÙØ§ØªÙŠØ Ø§Ù„Ø¢Ø®Ø±ÙŠÙ†.\n"
 
-#: src/ownertrustdlg.c:160
+#: src/ownertrustdlg.c:161
 msgid "_Marginal"
 msgstr "_Ù‡Ø§Ù…Ø´ÙŠØ©"
 
-#: src/ownertrustdlg.c:165
+#: src/ownertrustdlg.c:166
 msgid ""
 "You don't trust this user's ability to verify the validity of other people's "
 "keys enough to consider keys valid based on his/her sole word.\n"
@@ -1885,11 +1588,11 @@
 "Ù‡Ø°Ø§ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ØŒ Ù…Ø§ Ø¯Ø§Ù… Ù…ÙˆÙ‚Ø¹Ø§ Ù…Ù…Ù† Ù„Ø§ ÙŠÙ‚Ù„ Ø¹Ù† Ù…Ø³ØªØ®Ø¯Ù…ÙŽÙŠÙ† Ø§Ø«Ù†ÙŠÙ† Ø¢Ø®Ø±ÙŽÙŠÙ† Ù…ÙˆØ«ÙˆÙ‚ÙŽÙŠÙ† "
 "Ù‡Ø§Ù…Ø´ÙŠØ§\n"
 
-#: src/ownertrustdlg.c:182
+#: src/ownertrustdlg.c:183
 msgid "_Full"
 msgstr "_ÙƒØ§Ù…Ù„Ø©"
 
-#: src/ownertrustdlg.c:187
+#: src/ownertrustdlg.c:188
 msgid ""
 "You trust this user's ability to verify the validity of other people's keys "
 "so much, that you'll consider valid any key signed by him/her, provided this "
@@ -1898,11 +1601,11 @@
 "ØªØ«Ù‚ ÙÙŠ Ù‡Ø°Ø§ Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù… ÙÙŠ Ø§Ù„ØªØÙ‚Ù‚ Ù…Ù† Ù…ÙØ§ØªÙŠØ Ø§Ù„Ø¢Ø®Ø±ÙŠÙ† Ø¨Ù…Ø§ ÙŠÙƒÙÙŠ Ù„Ø£Ù† ØªØ¹Ø¯ ØµØÙŠØØ§ Ø£ÙŠ "
 "Ù…ÙØªØ§Ø ÙŠÙˆÙ‚Ø¹Ù‡ØŒ Ø¨ÙØ±Ø¶ Ø£Ù† Ù…ÙØªØ§ØÙ‡ ØµØÙŠØ.\n"
 
-#: src/ownertrustdlg.c:200
+#: src/ownertrustdlg.c:201
 msgid "U_ltimate"
 msgstr "_Ù…Ø·Ù„Ù‚Ø©"
 
-#: src/ownertrustdlg.c:205
+#: src/ownertrustdlg.c:206
 msgid ""
 "You consider this key valid, and trust the user so much that you will "
 "consider any key signed by him/her fully valid.\n"
@@ -1990,34 +1693,145 @@
 "protocol you specified."
 msgstr "Ù„Ø§ ØªÙˆØ¬Ø¯ Ù…Ù„ØÙ‚Ø© Ù„Ø¨Ø±ÙˆØªÙˆÙƒÙˆÙ„ Ø®Ø§Ø¯ÙˆÙ… Ø§Ù„Ù…ÙØ§ØªÙŠØ Ø§Ù„Ø°ÙŠ ØØ¯Ø¯ØªÙ‡."
 
-#: src/server_access.c:528 src/server_access.c:574
+#: src/server_access.c:528 src/server_access.c:572
 msgid "The keyserver you specified is not valid"
 msgstr "Ø®Ø§Ø¯ÙˆÙ… Ø§Ù„Ù…ÙØ§ØªÙŠØ Ø§Ù„Ø°ÙŠ ØØ¯Ø¯ØªÙ‡ ØºÙŠØ± ØµØ§Ù„Ø"
 
-#: src/settingsdlg.c:59
+#: src/settingsdlg.c:133 src/siglist.c:135
+msgid "Local"
+msgstr "Ù…ØÙ„ÙŠØ§"
+
+#: src/settingsdlg.c:134
+msgid "Local, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:135
+#, fuzzy
+msgid "Local, PKA"
+msgstr "Ù…ØÙ„ÙŠØ§"
+
+#: src/settingsdlg.c:136
+msgid "Local, PKA, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:137
+msgid "Local, Keyserver, PKA"
+msgstr ""
+
+#: src/settingsdlg.c:138
+#, fuzzy
+msgid "Local, kDNS"
+msgstr "Ù…ØÙ„ÙŠØ§"
+
+#: src/settingsdlg.c:139
+msgid "Local, kDNS, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:140
+msgid "PKA"
+msgstr ""
+
+#: src/settingsdlg.c:141
+msgid "kDNS"
+msgstr ""
+
+#: src/settingsdlg.c:142
+msgid "Custom"
+msgstr ""
+
+#: src/settingsdlg.c:208
+#, fuzzy
+msgid "<b>User interface</b>"
+msgstr "<b>Ø§Ø³ØªØ®Ø¯Ù… Ø§Ù„Ø·Ù‘ÙŽÙˆØ± Ø§Ù„_Ù…ØªÙ‚Ø¯Ù‘Ù…:</>"
+
+#: src/settingsdlg.c:215
+#, fuzzy
+msgid "Use _advanced mode"
+msgstr "<b>Ø§Ø³ØªØ®Ø¯Ù… Ø§Ù„Ø·Ù‘ÙŽÙˆØ± Ø§Ù„_Ù…ØªÙ‚Ø¯Ù‘Ù…:</>"
+
+#: src/settingsdlg.c:221
+msgid "Show advanced _options"
+msgstr ""
+
+#: src/settingsdlg.c:272
+msgid ""
+"No default key has been selected.  This may lead to problems when signing or "
+"encrypting.  For example you might later not be able to read a mail written "
+"by you and encrypted to someone else.\n"
+"\n"
+"Please consider creating your own key and select it then."
+msgstr ""
+
+#: src/settingsdlg.c:278
+msgid "Continue without a default key"
+msgstr ""
+
+#: src/settingsdlg.c:280
+#, fuzzy
+msgid "Let me select a default key"
+msgstr "Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ù…ØØ¯Ø¯ Ø¨Ø¯Ø¦ÙŠØ§:"
+
+#: src/settingsdlg.c:305
 msgid "<b>Default _key</b>"
 msgstr "<b>Ø§Ù„_Ù…ÙØªØ§Ø Ø§Ù„Ø¨Ø¯Ø¦ÙŠ</b>"
 
-#: src/settingsdlg.c:111
+#: src/settingsdlg.c:405
 msgid "<b>Default key_server</b>"
 msgstr "<b>_Ø®Ø§Ø¯ÙˆÙ… Ø§Ù„Ù…ÙØ§ØªÙŠØ Ø§Ù„Ø¨Ø¯Ø¦ÙŠ</b>"
 
-#: src/settingsdlg.c:158
-msgid "<b>Use _advanced mode</b>"
-msgstr "<b>Ø§Ø³ØªØ®Ø¯Ù… Ø§Ù„Ø·Ù‘ÙŽÙˆØ± Ø§Ù„_Ù…ØªÙ‚Ø¯Ù‘Ù…:</>"
+#: src/settingsdlg.c:602
+#, fuzzy
+msgid "<b>Auto key _locate</b>"
+msgstr "<b>_Ø®Ø§Ø¯ÙˆÙ… Ø§Ù„Ù…ÙØ§ØªÙŠØ Ø§Ù„Ø¨Ø¯Ø¦ÙŠ</b>"
 
-#: src/settingsdlg.c:193
-msgid "Settings"
-msgstr "Ø§Ù„ØªØ¶Ø¨ÙŠØ·Ø§Øª"
+#: src/settingsdlg.c:612
+msgid ""
+"The list of methods to locate keys via an email address.\n"
+"All given methods are used in turn until a matching key is found.  The "
+"supported methods are:\n"
+" Local\n"
+"   - Use the local keyring.\n"
+" Keyserver\n"
+"   - Use the default keyserver.\n"
+" PKA\n"
+"   - Use the Public Key Association.\n"
+" kDNS\n"
+"   - Use kDNS with the nameserver below.\n"
+" Custom\n"
+"   - Configured in the backend dialog.\n"
+msgstr ""
 
+#: src/settingsdlg.c:627
+msgid "Method:"
+msgstr ""
+
+#: src/settingsdlg.c:644
+msgid "The IP address of the nameserver used for the kDNS method."
+msgstr ""
+
+#: src/settingsdlg.c:646
+#, fuzzy
+msgid "kDNS Server:"
+msgstr "/Ø§Ù„_Ø®Ø§Ø¯ÙˆÙ…"
+
+#: src/settingsdlg.c:740
+#, fuzzy
+msgid "The URL given for the keyserver is not valid."
+msgstr "Ø®Ø§Ø¯ÙˆÙ… Ø§Ù„Ù…ÙØ§ØªÙŠØ Ø§Ù„Ø°ÙŠ ØØ¯Ø¯ØªÙ‡ ØºÙŠØ± ØµØ§Ù„Ø"
+
+#: src/settingsdlg.c:749
+msgid "The data given for \"Auto key locate\" is not valid."
+msgstr ""
+
+#: src/settingsdlg.c:886
+#, fuzzy
+msgid "GNU Privacy Assistant - Settings"
+msgstr "Ù…Ø³Ø§Ø¹Ø¯ Ø®ØµÙˆØµÙŠØ© Ø¬Ù†Ùˆ - Ù…ØØ±Ø± ØÙ„Ù‚Ø© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
+
 #: src/siglist.c:128
 msgid "Level"
 msgstr "Ø§Ù„Ù…Ø³ØªÙˆÙ‰"
 
-#: src/siglist.c:135
-msgid "Local"
-msgstr "Ù…ØÙ„ÙŠØ§"
-
 #: src/verifydlg.c:116
 msgid "Verify documents"
 msgstr "ØªØÙ‚Ù‚ Ù…Ù† Ø§Ù„ÙˆØ«ÙŠÙ‚Ø©"
@@ -2043,3 +1857,333 @@
 #: src/verifydlg.c:370
 msgid "Signatures:"
 msgstr "Ø§Ù„ØªÙˆÙ‚ÙŠØ¹Ø§Øª:"
+
+#~ msgid "/File/C_lear"
+#~ msgstr "/Ù…Ù„Ù/Ø§_Ù…Ø³Ø"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Ù…Ù„Ù/_Ø§ÙØªØ"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Ù…Ù„Ù/Ø§ØÙØ¸ _Ø¨Ø§Ø³Ù…"
+
+#~ msgid "/File/sep1"
+#~ msgstr "/Ù…Ù„Ù/sep1"
+
+#~ msgid "/File/_Sign"
+#~ msgstr "/Ù…Ù„Ù/_ÙˆÙ‚Ù‘Ø¹"
+
+#~ msgid "/File/_Verify"
+#~ msgstr "/Ù…Ù„Ù/_ØªØÙ‚Ù‚"
+
+#~ msgid "/File/_Encrypt"
+#~ msgstr "/Ù…Ù„Ù/_Ø¹Ù…Ù‘"
+
+#~ msgid "/File/_Decrypt"
+#~ msgstr "/Ù…Ù„Ù/_Ø¸Ù‡Ù‘ÙØ±"
+
+#~ msgid "/File/sep2"
+#~ msgstr "/Ù…Ù„Ù/sep2"
+
+#~ msgid "/File/_Close"
+#~ msgstr "/Ù…Ù„Ù/Ø£_ØºÙ„Ù‚"
+
+#~ msgid "/File/_Quit"
+#~ msgstr "/Ù…Ù„Ù/Ø§_Ø®Ø±Ø¬"
+
+#~ msgid "/Edit/_Undo"
+#~ msgstr "/ØªØØ±ÙŠØ±/_ØªØ±Ø§Ø¬Ø¹"
+
+#~ msgid "/Edit/_Redo"
+#~ msgstr "/ØªØØ±ÙŠØ±/Ø£_Ø¹ÙØ¯"
+
+#~ msgid "/Edit/sep0"
+#~ msgstr "/ØªØØ±ÙŠØ±/sep0"
+
+#~ msgid "/Edit/Cut"
+#~ msgstr "/ØªØØ±ÙŠØ±/Ù‚Øµ"
+
+#~ msgid "/Edit/_Copy"
+#~ msgstr "/ØªØØ±ÙŠØ±/Ø§_Ù†Ø³Ø®"
+
+#~ msgid "/Edit/_Paste"
+#~ msgstr "/ØªØØ±ÙŠØ±/Ø§_Ù„ØµÙ‚"
+
+#~ msgid "/Edit/_Delete"
+#~ msgstr "/ØªØØ±ÙŠØ±/Ø§_ØØ°Ù"
+
+#~ msgid "/Edit/sep1"
+#~ msgstr "/ØªØØ±ÙŠØ±/sep1"
+
+#~ msgid "/Edit/Select _All"
+#~ msgstr "/ØªØØ±ÙŠØ±/Ø§_Ø®ØªØ± Ø§Ù„ÙƒÙ„"
+
+#~ msgid "/Edit/sep2"
+#~ msgstr "/ØªØØ±ÙŠØ±/sep2"
+
+#~ msgid "/Edit/Pr_eferences..."
+#~ msgstr "/ØªØØ±ÙŠØ±/Ø§Ù„_ØªÙØ¶ÙŠÙ„Ø§Øª..."
+
+#~ msgid "/Edit/_Backend Preferences..."
+#~ msgstr "/ØªØØ±ÙŠØ±/ØªÙØ¶ÙŠÙ„Ø§Øª Ø§Ù„_Ø®Ù„ÙÙŠØ©..."
+
+#~ msgid "/_Windows"
+#~ msgstr "/_Ù†ÙˆØ§ÙØ°"
+
+#~ msgid "/Windows/_Keyring Editor"
+#~ msgstr "/Ù†ÙˆØ§ÙØ°/_Ù…ØØ±Ø± ØÙ„Ù‚Ø© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
+
+#~ msgid "/Windows/_Filemanager"
+#~ msgstr "/Ù†ÙˆØ§ÙØ°/_Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ù„ÙØ§Øª"
+
+#~ msgid "/Windows/_Clipboard"
+#~ msgstr "/Ù†ÙˆØ§ÙØ°/Ø§Ù„_ØØ§ÙØ¸Ø©"
+
+#~ msgid "/Edit/Copy"
+#~ msgstr "/ØªØØ±ÙŠØ±/Ø§Ù†Ø³Ø®"
+
+#~ msgid "/Edit/Paste"
+#~ msgstr "/ØªØØ±ÙŠØ±/Ø£Ù„ØµÙ‚"
+
+#~ msgid "clear buffer"
+#~ msgstr "Ø£Ø®Ù„ Ø§Ù„Ø¨Ø±Ø§Ø"
+
+#~ msgid "open file"
+#~ msgstr "Ø§ÙØªØ Ù…Ù„ÙØ§"
+
+#~ msgid "save file as"
+#~ msgstr "Ø§ØÙØ¸ Ø§Ù„Ù…Ù„Ù Ø¨Ø§Ø³Ù…"
+
+#~ msgid "cut the selection"
+#~ msgstr "Ù‚Øµ Ø§Ù„Ù…ØØ¯Ø¯"
+
+#~ msgid "copy the selection"
+#~ msgstr "Ø§Ù†Ø³Ø® Ø§Ù„Ù…ØØ¯Ø¯"
+
+#~ msgid "paste the clipboard"
+#~ msgstr "Ø£Ù„ØµÙ‚ Ø§Ù„ØØ§ÙØ¸Ø©"
+
+#~ msgid "Sign the selected text"
+#~ msgstr "ÙŠÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù†ØµÙŽ Ø§Ù„Ù…ØØ¯Ø¯"
+
+#~ msgid "verify text"
+#~ msgstr "ØªØÙ‚Ù‚ Ù…Ù† Ø§Ù„Ù†ØµÙ‘"
+
+#~ msgid "encrypt text"
+#~ msgstr "Ø¹Ù…Ù‘ Ø§Ù„Ù†ØµÙ‘"
+
+#~ msgid "decrypt text"
+#~ msgstr "Ø¸Ù‡Ù‘ÙØ± Ø§Ù„Ù†ØµÙ‘"
+
+#~ msgid "preferences"
+#~ msgstr "Ø§Ù„ØªÙØ¶ÙŠÙ„Ø§Øª"
+
+#~ msgid "Open the keyring editor"
+#~ msgstr "ÙŠÙØªØ Ù…ØØ±Ø± ØÙ„Ù‚Ø© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
+
+#~ msgid "keyring editor"
+#~ msgstr "Ù…ØØ±Ø± ØÙ„Ù‚Ø© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
+
+#~ msgid "Open the file manager"
+#~ msgstr "ÙŠÙØªØ Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ù„ÙØ§Øª"
+
+#~ msgid "file manager"
+#~ msgstr "Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ù„ÙØ§Øª"
+
+#~ msgid "Help"
+#~ msgstr "Ù…Ø³Ø§Ø¹Ø¯Ø©"
+
+#~ msgid "help"
+#~ msgstr "Ù…Ø³Ø§Ø¹Ø¯Ø©"
+
+#~ msgid "/File/Sign"
+#~ msgstr "/Ù…Ù„Ù/ÙˆÙ‚Ù‘Ø¹"
+
+#~ msgid "/File/Verify"
+#~ msgstr "/Ù…Ù„Ù/ØªØÙ‚Ù‚"
+
+#~ msgid "/File/Encrypt"
+#~ msgstr "/Ù…Ù„Ù/Ø¹Ù…Ù‘"
+
+#~ msgid "/File/Decrypt"
+#~ msgstr "/Ù…Ù„Ù/Ø§Ø³ØªØ®Ø±Ø¬"
+
+#~ msgid "close files"
+#~ msgstr "Ø£ØºÙ„Ù‚ Ø§Ù„Ù…Ù„ÙØ§Øª"
+
+#~ msgid "sign file"
+#~ msgstr "ÙˆÙ‚Ø¹ Ù…Ù„ÙÙ‘Ø§"
+
+#~ msgid "verify file"
+#~ msgstr "ØªØÙ‚Ù‚ Ù…Ù† Ø§Ù„Ù…Ù„ÙÙ‘"
+
+#~ msgid "encrypt file"
+#~ msgstr "Ø¹Ù…Ù‘ Ø§Ù„Ù…Ù„ÙÙ‘"
+
+#~ msgid "decrypt file"
+#~ msgstr "Ø§Ø³ØªØ®Ø±Ø¬ Ø§Ù„Ù…Ù„ÙÙ‘"
+
+#~ msgid "Open the clipboard"
+#~ msgstr "ÙŠÙØªØ Ø§Ù„ØØ§ÙØ¸Ø©"
+
+#~ msgid "clipboard"
+#~ msgstr "Ø§Ù„ØØ§ÙØ¸Ø©"
+
+#~ msgid "_Back"
+#~ msgstr "Ù„Ù„_Ø®Ù„Ù"
+
+#~ msgid "_Forward"
+#~ msgstr "Ù„Ù„Ø£_Ù…Ø§Ù…"
+
+#~ msgid "_Apply"
+#~ msgstr "_Ø·Ø¨Ù‘Ù‚"
+
+#~ msgid "Brought to you by:"
+#~ msgstr "Ù‚Ø¯Ù‘Ù…Ù‡ Ù„Ùƒ:"
+
+#~ msgid "GPA is Free Software under the"
+#~ msgstr "â€GPA Ø¨Ø±Ù…Ø¬ÙŠØ© ØØ±Ù‘Ø© ØªØØª"
+
+#~ msgid "GNU General Public License."
+#~ msgstr "Ø±Ø®ØµØ© Ø¬Ù†Ùˆ Ø§Ù„Ø¹Ù…ÙˆÙ…ÙŠØ© Ø§Ù„Ø¹Ø§Ù…Ø©."
+
+#~ msgid "For news see:"
+#~ msgstr "Ù„Ù„Ø£Ø®Ø¨Ø§Ø± Ø±Ø§Ø¬Ø¹:"
+
+#~ msgid "http://www.gpg4win.org"
+#~ msgstr "http://www.gpg4win.org"
+
+#~ msgid "http://www.gnupg.org"
+#~ msgstr "http://www.gnupg.org"
+
+#~ msgid "GNU General Public License"
+#~ msgstr "Ø±Ø®ØµØ© Ø¬Ù†Ùˆ Ø§Ù„Ø¹Ù…ÙˆÙ…ÙŠØ© Ø§Ù„Ø¹Ø§Ù…Ø©"
+
+#~ msgid "_GNU General Public License"
+#~ msgstr "Ø±Ø®ØµØ© _Ø¬Ù†Ùˆ Ø§Ù„Ø¹Ù…ÙˆÙ…ÙŠØ© Ø§Ù„Ø¹Ø§Ù…Ø©"
+
+#~ msgid "Show Help Text\n"
+#~ msgstr "Ø§Ø¹Ø±Ø¶ Ù†Øµ Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©\n"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Ù…Ø³Ø§Ø¹Ø¯Ø©"
+
+#~ msgid "/Help/_Contents"
+#~ msgstr "/Ù…Ø³Ø§Ø¹Ø¯Ø©/Ø§Ù„_Ù…ØØªÙˆÙŠØ§Øª"
+
+#~ msgid "/Help/_License"
+#~ msgstr "/Ù…Ø³Ø§Ø¹Ø¯Ø©/Ø§Ù„_Ø±Ø®ØµØ©"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/Ù…Ø³Ø§Ø¹Ø¯Ø©/_Ø¹Ù†Ù’"
+
+#~ msgid "Please insert your name"
+#~ msgstr "Ø£Ø¯Ø®Ù„ Ø§Ø³Ù…Ùƒ"
+
+#~ msgid "Please insert your email address"
+#~ msgstr "Ø£Ø¯Ø®Ù„ Ø¹Ù†ÙˆØ§Ù† Ø¨Ø±ÙŠØ¯Ùƒ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ"
+
+#~ msgid "/Keys/_Refresh"
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/_ØØ¯Ù‘Ø«"
+
+#~ msgid "/Keys/sep0"
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/sep0"
+
+#~ msgid "/Keys/_Delete Keys..."
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/Ø§_ØØ°Ù Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+
+#~ msgid "/Keys/sep1"
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/sep1"
+
+#~ msgid "/Keys/_Sign Keys..."
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/_ÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+
+#~ msgid "/Keys/Set _Owner Trust..."
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/ØØ¯Ø¯ Ø§Ù„_Ø«Ù‚Ø© ÙÙŠ Ø§Ù„Ù…Ø§Ù„Ùƒ..."
+
+#~ msgid "/Keys/_Edit Private Key..."
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/ØØ±Ù‘_Ø± Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø³Ø±Ù‘ÙŠ..."
+
+#~ msgid "/Keys/sep2"
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/sep2"
+
+#~ msgid "/Keys/_Import Keys..."
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/Ø§_Ø³ØªÙˆØ±Ø¯ Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+
+#~ msgid "/Keys/E_xport Keys..."
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/_ØµØ¯Ù‘Ø± Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+
+#~ msgid "/Keys/_Backup..."
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/Ø§_ØÙØ¸ Ø§ØØªÙŠØ§Ø·ÙŠØ§..."
+
+#~ msgid "/Server/_Send Keys..."
+#~ msgstr "/Ø§Ù„Ø®Ø§Ø¯ÙˆÙ…/Ø£_Ø±Ø³ÙÙ„ Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+
+#~ msgid "/Windows/_File Manager"
+#~ msgstr "/Ù†ÙˆØ§ÙØ°/_Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ù„ÙØ§Øª"
+
+#~ msgid "/Keys/Export Keys..."
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/ØµØ¯Ù‘Ø± Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+
+#~ msgid "/Keys/Delete Keys..."
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/Ø§ØØ°Ù Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+
+#~ msgid "/Server/Send Keys..."
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/Ø£Ø±Ø³ÙÙ„ Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+
+#~ msgid "/Keys/Set Owner Trust..."
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/ØØ¯Ù‘Ø¯ Ø§Ù„Ø«Ù‚Ø© ÙÙŠ Ø§Ù„Ù…Ø§Ù„Ùƒ..."
+
+#~ msgid "/Keys/Sign Keys..."
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/ÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù…ÙØ§ØªÙŠØ..."
+
+#~ msgid "/Keys/Edit Private Key..."
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/ØØ±Ù‘Ø± Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø³Ø±ÙŠ..."
+
+#~ msgid "/Keys/Backup..."
+#~ msgstr "/Ø§Ù„Ù…ÙØ§ØªÙŠØ/Ø§ØÙØ¸ Ø§ØØªÙŠØ§Ø·ÙŠØ§..."
+
+#~ msgid "/_Copy"
+#~ msgstr "/Ø§_Ù†Ø³Ø®"
+
+#~ msgid "/_Paste"
+#~ msgstr "/Ø£_Ù„ØµÙ‚"
+
+#~ msgid "/Set Owner Trust..."
+#~ msgstr "/ØØ¯Ø¯ Ø§Ù„Ø«Ù‚Ø© ÙÙŠ Ø§Ù„Ù…Ø§Ù„Ùƒ..."
+
+#~ msgid "/Sign Keys..."
+#~ msgstr "/ÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù…Ù„ÙØ§Øª..."
+
+#~ msgid "/Edit Private Key..."
+#~ msgstr "/ØØ±Ø± Ø§Ù„Ù…ÙØªØ§Ø Ø§Ù„Ø³Ø±ÙŠ..."
+
+#~ msgid "/Backup..."
+#~ msgstr "/Ø§ØÙØ¸ Ø§ØØªÙŠØ§Ø·ÙŠØ§..."
+
+#~ msgid "edit key"
+#~ msgstr "ØØ±Ù‘Ø± Ø§Ù„Ù…ÙØªØ§Ø"
+
+#~ msgid "remove key"
+#~ msgstr "Ø§ØØ°Ù Ø§Ù„Ù…ÙØªØ§Ø"
+
+#~ msgid "sign key"
+#~ msgstr "ÙˆÙ‚Ù‘Ø¹ Ø§Ù„Ù…ÙØªØ§Ø"
+
+#~ msgid "import keys"
+#~ msgstr "Ø§Ø³ØªÙˆØ±ÙØ¯ Ø§Ù„Ù…ÙØ§ØªÙŠØ"
+
+#~ msgid "export keys"
+#~ msgstr "ØµØ¯Ù‘Ø± Ø§Ù„Ù…ÙØ§ØªÙŠØ"
+
+#~ msgid "brief"
+#~ msgstr "Ù…ÙˆØ¬Ø²Ø©"
+
+#~ msgid "detailed"
+#~ msgstr "Ù…ÙÙØµÙ‘ÙŽÙ„Ø©"
+
+#~ msgid "refresh keyring"
+#~ msgstr "Ø£Ù†Ø¹Ø´ ØÙ„Ù‚Ø© Ø§Ù„Ù…ÙØ§ØªÙŠØ"
+
+#~ msgid "Settings"
+#~ msgstr "Ø§Ù„ØªØ¶Ø¨ÙŠØ·Ø§Øª"

Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/cs.po	2008-05-08 12:53:41 UTC (rev 891)
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-03-12 12:29+0100\n"
+"POT-Creation-Date: 2008-05-08 14:51+0200\n"
 "PO-Revision-Date: 2007-05-24 15:04+0200\n"
 "Last-Translator: ZdenÄ›k HataÅ¡ <zdenek.hatas at gmail.com>\n"
 "Language-Team: czech <cs at li.org>\n"
@@ -18,431 +18,217 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: src/clipboard.c:367 src/fileman.c:350
+#: src/clipboard.c:376 src/fileman.c:392
 msgid "Open File"
 msgstr "OtevÅ™Ãt soubor"
 
-#: src/clipboard.c:395 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "ZprÃ¡va GPA"
 
 #. TRANSLATORS: The arguments are the filename, the integer size
 #. and the unit (such as KB or MB).
-#: src/clipboard.c:412
+#: src/clipboard.c:421
 #, fuzzy, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
 msgstr ""
 "Soubor %s jiÅ¾ existuje.\n"
 "Chcete jej pÅ™epsat?"
 
-#: src/clipboard.c:481
+#: src/clipboard.c:542
 msgid "Save As..."
 msgstr ""
 
-#: src/clipboard.c:522 src/clipboard.c:552 src/clipboard.c:582
-#: src/clipboard.c:612 src/clipboard.c:1113 src/fileman.c:675
-#: src/keyring.c:1657
+#: src/clipboard.c:583 src/clipboard.c:613 src/clipboard.c:643
+#: src/clipboard.c:673 src/clipboard.c:1034
 #, fuzzy
 msgid "Clipboard"
 msgstr "Zur _Zwischenablage exportieren"
 
-#: src/clipboard.c:692 src/fileman.c:472 src/keyring.c:863
-msgid "/_File"
+#: src/clipboard.c:755 src/fileman.c:515 src/keyring.c:884
+#, fuzzy
+msgid "_File"
 msgstr "/_Soubor"
 
-#: src/clipboard.c:693 src/fileman.c:474
-msgid "/File/C_lear"
-msgstr "/Soubor/Vymazat"
-
-#: src/clipboard.c:694 src/fileman.c:473
-msgid "/File/_Open"
-msgstr "/Soubor/_OtevÅ™Ãt"
-
-#: src/clipboard.c:695
+#: src/clipboard.c:756 src/fileman.c:516 src/keyring.c:885
 #, fuzzy
-msgid "/File/Save _As"
-msgstr "/Soubor/_ZavÅ™Ãt"
-
-#: src/clipboard.c:697 src/fileman.c:475
-msgid "/File/sep1"
-msgstr "/Soubor/sep1"
-
-#: src/clipboard.c:698 src/fileman.c:476
-msgid "/File/_Sign"
-msgstr "/Soubor/Podep_sat"
-
-#: src/clipboard.c:699 src/fileman.c:477
-msgid "/File/_Verify"
-msgstr "/Soubor/O_vÄ›Å™it"
-
-#: src/clipboard.c:700 src/fileman.c:478
-msgid "/File/_Encrypt"
-msgstr "/Soubor/Å _ifrovat"
-
-#: src/clipboard.c:701 src/fileman.c:479
-msgid "/File/_Decrypt"
-msgstr "/Soubor/_DeÅ¡ifrovat"
-
-#: src/clipboard.c:702 src/fileman.c:480
-msgid "/File/sep2"
-msgstr "/Soubor/sep2"
-
-#: src/clipboard.c:703 src/fileman.c:481 src/keyring.c:864
-msgid "/File/_Close"
-msgstr "/Soubor/_ZavÅ™Ãt"
-
-#: src/clipboard.c:704 src/fileman.c:482 src/keyring.c:866
-msgid "/File/_Quit"
-msgstr "/Soubor/U_konÄit"
-
-#: src/clipboard.c:707 src/fileman.c:485 src/keyring.c:869
-msgid "/_Edit"
+msgid "_Edit"
 msgstr "/_Upravit"
 
-#: src/clipboard.c:710
-#, fuzzy
-msgid "/Edit/_Undo"
-msgstr "/Upravit/KopÃrovat"
+#: src/clipboard.c:760
+msgid "Clear buffer"
+msgstr ""
 
-#: src/clipboard.c:711
-#, fuzzy
-msgid "/Edit/_Redo"
-msgstr "/Upravit/KopÃrovat"
+#: src/clipboard.c:762 src/fileman.c:520
+msgid "Open a file"
+msgstr "OtevÅ™Ãt soubor"
 
-#: src/clipboard.c:712
+#: src/clipboard.c:764
 #, fuzzy
-msgid "/Edit/sep0"
-msgstr "/Upravit/sep2"
+msgid "Save to a file"
+msgstr "OtevÅ™Ãt soubor"
 
-#: src/clipboard.c:714 src/clipboard.c:750
+#: src/clipboard.c:766
 #, fuzzy
-msgid "/Edit/Cut"
-msgstr "/Upravit/KopÃrovat"
+msgid "Sign buffer text"
+msgstr "podepsat klÃÄ"
 
-#: src/clipboard.c:715 src/keyring.c:870
-msgid "/Edit/_Copy"
-msgstr "/Upravit/KopÃrovat"
-
-#: src/clipboard.c:716 src/keyring.c:872
-msgid "/Edit/_Paste"
-msgstr "/Upravit/VloÅ¾it"
-
-#: src/clipboard.c:717
+#: src/clipboard.c:768
 #, fuzzy
-msgid "/Edit/_Delete"
-msgstr "/Upravit/VloÅ¾it"
+msgid "Check signatures of buffer text"
+msgstr "Zkontrolovat podpis vybranÃ©ho souboru"
 
-#: src/clipboard.c:718 src/keyring.c:874
-msgid "/Edit/sep1"
-msgstr "/Upravit/sep1"
-
-#: src/clipboard.c:719 src/fileman.c:486 src/keyring.c:875
-msgid "/Edit/Select _All"
-msgstr "/Upravit/Vybrat vÅ¡e"
-
-#: src/clipboard.c:721 src/fileman.c:487 src/keyring.c:876
-msgid "/Edit/sep2"
-msgstr "/Upravit/sep2"
-
-#: src/clipboard.c:722 src/fileman.c:488 src/keyring.c:877
-msgid "/Edit/Pr_eferences..."
-msgstr "/Upravit/Na_stavenÃ"
-
-#: src/clipboard.c:724 src/fileman.c:490 src/keyring.c:879
+#: src/clipboard.c:770
 #, fuzzy
-msgid "/Edit/_Backend Preferences..."
-msgstr "/Upravit/Na_stavenÃ"
+msgid "Encrypt the buffer text"
+msgstr "ZaÅ¡ifrovat vybranÃ½ soubor"
 
-#: src/clipboard.c:728 src/fileman.c:494 src/keyring.c:906
-msgid "/_Windows"
-msgstr "/_Okna"
-
-#: src/clipboard.c:729 src/fileman.c:495 src/keyring.c:907
-msgid "/Windows/_Keyring Editor"
-msgstr "/Okna/SprÃ¡vce _klÃÄÅ¯"
-
-#: src/clipboard.c:730 src/fileman.c:496
-msgid "/Windows/_Filemanager"
-msgstr "/Okna/_SprÃ¡vce souborÅ¯"
-
-#: src/clipboard.c:731 src/fileman.c:497 src/keyring.c:909
+#: src/clipboard.c:772
 #, fuzzy
-msgid "/Windows/_Clipboard"
-msgstr "/Okna/_SprÃ¡vce souborÅ¯"
+msgid "Decrypt the buffer text"
+msgstr "DeÅ¡ifrovat vybranÃ½ soubor"
 
-#: src/clipboard.c:758 src/keyring.c:948
-msgid "/Edit/Copy"
-msgstr "/Upravit/KopÃrovat"
-
-#: src/clipboard.c:766
-#, fuzzy
-msgid "/Edit/Delete"
-msgstr "/Upravit/Vybrat vÅ¡e"
-
 #: src/clipboard.c:774
-#, fuzzy
-msgid "/Edit/Paste"
-msgstr "/Upravit/VloÅ¾it"
-
-#: src/clipboard.c:879
-msgid "Clear buffer"
+msgid "Close the buffer"
 msgstr ""
 
-#: src/clipboard.c:879
-msgid "clear buffer"
+#: src/clipboard.c:776 src/fileman.c:534 src/keyring.c:893
+msgid "Quit the program"
 msgstr ""
 
-#: src/clipboard.c:887 src/fileman.c:602
-msgid "Open a file"
-msgstr "OtevÅ™Ãt soubor"
-
-#: src/clipboard.c:887 src/fileman.c:602
-msgid "open file"
-msgstr "otevÅ™Ãt soubor"
-
-#: src/clipboard.c:892
+#: src/clipboard.c:782
 #, fuzzy
-msgid "Save to a file"
-msgstr "OtevÅ™Ãt soubor"
+msgid "Undo the last action"
+msgstr "ZaÅ¡ifrovat vybranÃ½ soubor"
 
-#: src/clipboard.c:892
-#, fuzzy
-msgid "save file as"
-msgstr "Datei _speichern unter: "
+#: src/clipboard.c:784
+msgid "Redo the last undone action"
+msgstr ""
 
-#: src/clipboard.c:900
+#: src/clipboard.c:787
 #, fuzzy
 msgid "Cut the selection"
 msgstr "ZaÅ¡ifrovat vybranÃ½ soubor"
 
-#: src/clipboard.c:901
+#: src/clipboard.c:789 src/keyring.c:897
 #, fuzzy
-msgid "cut the selection"
-msgstr "ZaÅ¡ifrovat vybranÃ½ soubor"
-
-#: src/clipboard.c:907
-#, fuzzy
 msgid "Copy the selection"
 msgstr "ZaÅ¡ifrovat vybranÃ½ soubor"
 
-#: src/clipboard.c:908
+#: src/clipboard.c:791 src/keyring.c:899
 #, fuzzy
-msgid "copy the selection"
-msgstr "ZaÅ¡ifrovat vybranÃ½ soubor"
-
-#: src/clipboard.c:914
-#, fuzzy
 msgid "Paste the clipboard"
 msgstr "Zur _Zwischenablage exportieren"
 
-#: src/clipboard.c:915
+#: src/clipboard.c:793
 #, fuzzy
-msgid "paste the clipboard"
-msgstr "Zur _Zwischenablage exportieren"
-
-#: src/clipboard.c:925 src/fileman.c:612 src/keyring.c:1570
-msgid "Sign"
-msgstr "Podepsat"
-
-#: src/clipboard.c:926
-#, fuzzy
-msgid "Sign the selected text"
-msgstr "Podepsat vybranÃ½ klÃÄ"
-
-#: src/clipboard.c:927
-#, fuzzy
-msgid "sign text"
-msgstr "podepsat klÃÄ"
-
-#: src/clipboard.c:935 src/fileman.c:623
-msgid "Verify"
-msgstr "OvÄ›Å™it"
-
-#: src/clipboard.c:936
-#, fuzzy
-msgid "Check signatures of selected text"
-msgstr "Zkontrolovat podpis vybranÃ©ho souboru"
-
-#: src/clipboard.c:937
-#, fuzzy
-msgid "verify text"
-msgstr "ovÄ›Å™it soubor"
-
-#: src/clipboard.c:945 src/fileman.c:634
-msgid "Encrypt"
-msgstr "ZaÅ¡ifrovat"
-
-#: src/clipboard.c:946
-#, fuzzy
-msgid "Encrypt the selected text"
-msgstr "ZaÅ¡ifrovat vybranÃ½ soubor"
-
-#: src/clipboard.c:947
-#, fuzzy
-msgid "encrypt text"
-msgstr "zaÅ¡ifrovat soubor"
-
-#: src/clipboard.c:955 src/fileman.c:645
-msgid "Decrypt"
-msgstr "DeÅ¡ifrovat"
-
-#: src/clipboard.c:956
-#, fuzzy
-msgid "Decrypt the selected text"
+msgid "Delete the selected text"
 msgstr "DeÅ¡ifrovat vybranÃ½ soubor"
 
-#: src/clipboard.c:957
-#, fuzzy
-msgid "decrypt text"
-msgstr "deÅ¡ifrovat soubor"
+#: src/clipboard.c:795
+msgid "Select the entire document"
+msgstr ""
 
-#: src/clipboard.c:967 src/fileman.c:658 src/keyring.c:1631
+#: src/clipboard.c:902 src/fileman.c:625
 #, fuzzy
-msgid "Open the preferences dialog"
-msgstr "OtevÅ™Ãt dialog NastavenÃ"
-
-#: src/clipboard.c:968 src/fileman.c:659 src/keyring.c:1632
-msgid "preferences"
-msgstr "nastavenÃ"
-
-#: src/clipboard.c:975 src/fileman.c:666
-#, fuzzy
 msgid "Keyring"
 msgstr "SprÃ¡vce klÃÄÅ¯"
 
-#: src/clipboard.c:976 src/fileman.c:667
-#, fuzzy
-msgid "Open the keyring editor"
-msgstr "otevÅ™Ãt SprÃ¡vce klÃÄÅ¯ (vÃ½chozÃ)"
-
-#: src/clipboard.c:977 src/fileman.c:668
-#, fuzzy
-msgid "keyring editor"
-msgstr "SprÃ¡vce klÃÄÅ¯"
-
-#: src/clipboard.c:983 src/keyring.c:1648
+#: src/clipboard.c:904 src/keyring.c:1073
 msgid "Files"
 msgstr "Soubory"
 
-#: src/clipboard.c:984 src/keyring.c:1649
+#: src/clipboard.c:1004
 #, fuzzy
-msgid "Open the file manager"
-msgstr "OtevÅ™Ãt SprÃ¡vce souborÅ¯"
-
-#: src/clipboard.c:985 src/keyring.c:1650
-msgid "file manager"
-msgstr "SprÃ¡vce souborÅ¯"
-
-#: src/clipboard.c:992 src/fileman.c:684 src/keyring.c:1665
-msgid "Help"
-msgstr "NÃ¡povÄ›da"
-
-#: src/clipboard.c:993 src/fileman.c:685 src/keyring.c:1666
-msgid "Understanding the GNU Privacy Assistant"
-msgstr "Co je GNU Privacy Assistant"
-
-#: src/clipboard.c:994 src/fileman.c:686 src/keyring.c:1667
-msgid "help"
-msgstr "nÃ¡povÄ›da"
-
-#: src/clipboard.c:1084
-#, fuzzy
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Privacy Assistant - SprÃ¡vce souborÅ¯"
 
-#: src/confdialog.c:993
+#: src/confdialog.c:994
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 #, fuzzy
 msgid "Use default values"
 msgstr "Standard-SchlÃ¼ssel festlegen"
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 #, fuzzy
 msgid "Use default value"
 msgstr "Standard-SchlÃ¼ssel festlegen"
 
-#: src/confdialog.c:1146
+#: src/confdialog.c:1147
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1155
+#: src/confdialog.c:1156
 #, fuzzy
 msgid "Use default argument"
 msgstr "EmpfÃ¤ngerliste festlegen"
 
-#: src/confdialog.c:1280
+#: src/confdialog.c:1281
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1325
+#: src/confdialog.c:1326
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1334
+#: src/confdialog.c:1332
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1346
+#: src/confdialog.c:1351
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1350
+#: src/confdialog.c:1355
 #, fuzzy
 msgid "Level:"
 msgstr "ÃšroveÅˆ"
 
-#: src/confdialog.c:1359
+#: src/confdialog.c:1364
 #, fuzzy
 msgid "Basic"
 msgstr "_ZpÄ›t"
 
-#: src/confdialog.c:1360
+#: src/confdialog.c:1365
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1361
+#: src/confdialog.c:1366
 #, fuzzy
 msgid "Expert"
 msgstr "Exportovat"
 
-#: src/encryptdlg.c:142 src/expirydlg.c:116 src/filesigndlg.c:133
-#: src/gpabackupop.c:292 src/gpaprogressdlg.c:146 src/gparecvkeydlg.c:96
-#: src/gpawizard.c:289 src/gpgmetools.c:696 src/keygendlg.c:149
-#: src/ownertrustdlg.c:111 src/passwddlg.c:100
-msgid "_Cancel"
-msgstr "_ZruÅ¡it"
-
-#: src/encryptdlg.c:143
+#: src/encryptdlg.c:139
 #, fuzzy
 msgid "Encrypt documents"
 msgstr "ZaÅ¡ifrovat soubor"
 
-#: src/encryptdlg.c:174
+#: src/encryptdlg.c:156
 msgid "_Public Keys"
 msgstr "_VeÅ™ejnÃ© klÃÄe"
 
-#: src/encryptdlg.c:177
+#: src/encryptdlg.c:179 src/icons.c:198
 msgid "_Sign"
 msgstr "Podep_sat"
 
-#: src/encryptdlg.c:201 src/filesigndlg.c:185
+#: src/encryptdlg.c:185
 msgid "Sign _as "
 msgstr "Podeps_at jako"
 
-#: src/encryptdlg.c:215 src/filesigndlg.c:187
+#: src/encryptdlg.c:215 src/filesigndlg.c:227
 msgid "A_rmor"
 msgstr "ASCII-_zakÃ³dovat"
 
@@ -450,148 +236,100 @@
 msgid "Please provide a correct date."
 msgstr "Zadejte prosÃm platnÃ© datum."
 
-#: src/expirydlg.c:111
+#: src/expirydlg.c:108
 msgid "Change expiry date"
 msgstr "ZmÄ›nit datum expirace"
 
-#: src/expirydlg.c:129
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+msgid "_Cancel"
+msgstr "_ZruÅ¡it"
+
+#: src/expirydlg.c:124
 msgid "_never expire"
 msgstr "_nikdy nevyprÅ¡Ã"
 
-#: src/expirydlg.c:134
+#: src/expirydlg.c:129
 msgid "_expire on:"
 msgstr "_vyprÅ¡Ã:"
 
-#: src/fileman.c:355 src/fileman.c:953
-msgid "The file is already open."
-msgstr "Soubor je jiÅ¾ otevÅ™enÃ½"
-
-#: src/fileman.c:516
-msgid "/File/Sign"
-msgstr "/Soubor/Podepsat"
-
-#: src/fileman.c:521
-msgid "/File/Verify"
-msgstr "/Soubor/OvÄ›Å™it"
-
-#: src/fileman.c:526
-msgid "/File/Encrypt"
-msgstr "/Soubor/Å ifrovat"
-
-#: src/fileman.c:531
-msgid "/File/Decrypt"
-msgstr "/Soubor/DeÅ¡ifrovat"
-
-#: src/fileman.c:606
+#: src/fileman.c:522
 msgid "Close all files"
 msgstr "Vymazat vÅ¡echny soubory"
 
-#: src/fileman.c:606
-msgid "close files"
-msgstr "UzavÅ™Ãt soubory"
-
-#: src/fileman.c:613
+#: src/fileman.c:524
 msgid "Sign the selected file"
 msgstr "Podepsat vybranÃ½ soubor"
 
-#: src/fileman.c:614
-msgid "sign file"
-msgstr "podepsat soubor"
-
-#: src/fileman.c:624
+#: src/fileman.c:526
 msgid "Check signatures of selected file"
 msgstr "Zkontrolovat podpis vybranÃ©ho souboru"
 
-#: src/fileman.c:625
-msgid "verify file"
-msgstr "ovÄ›Å™it soubor"
-
-#: src/fileman.c:635
+#: src/fileman.c:528
 msgid "Encrypt the selected file"
 msgstr "ZaÅ¡ifrovat vybranÃ½ soubor"
 
-#: src/fileman.c:636
-msgid "encrypt file"
-msgstr "zaÅ¡ifrovat soubor"
-
-#: src/fileman.c:646
+#: src/fileman.c:530
 msgid "Decrypt the selected file"
 msgstr "DeÅ¡ifrovat vybranÃ½ soubor"
 
-#: src/fileman.c:647
-msgid "decrypt file"
-msgstr "deÅ¡ifrovat soubor"
+#: src/fileman.c:532
+msgid "Close the window"
+msgstr ""
 
-#: src/fileman.c:676 src/keyring.c:1658
+#: src/fileman.c:538
 #, fuzzy
-msgid "Open the clipboard"
-msgstr "Zur _Zwischenablage exportieren"
+msgid "Select all files"
+msgstr "Vymazat vÅ¡echny soubory"
 
-#: src/fileman.c:677 src/keyring.c:1659
-#, fuzzy
-msgid "clipboard"
-msgstr "Zur _Zwischenablage exportieren"
-
-#: src/fileman.c:785
+#: src/fileman.c:731
 msgid "File"
 msgstr "Soubor"
 
-#: src/fileman.c:850
+#: src/fileman.c:796
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - SprÃ¡vce souborÅ¯"
 
-#: src/fileman.c:876
+#: src/fileman.c:819
 #, fuzzy
 msgid "File Manager"
 msgstr "SprÃ¡vce souborÅ¯"
 
-#: src/filesigndlg.c:134
+#: src/fileman.c:895
+msgid "The file is already open."
+msgstr "Soubor je jiÅ¾ otevÅ™enÃ½"
+
+#: src/filesigndlg.c:171
 msgid "Sign documents"
 msgstr ""
 
-#: src/filesigndlg.c:144
-msgid "Signing Mode"
+#: src/filesigndlg.c:180
+#, fuzzy
+msgid "<b>Sign _as</b>"
+msgstr "Podeps_at jako"
+
+#: src/filesigndlg.c:201
+#, fuzzy
+msgid "<b>Signing Mode</b>"
 msgstr "MÃ³d podpisu"
 
-#: src/filesigndlg.c:152
-msgid "si_gn and compress"
+#: src/filesigndlg.c:211
+#, fuzzy
+msgid "Si_gn and compress"
 msgstr "podep_sat a komprimovat"
 
-#: src/filesigndlg.c:158
-msgid "_cleartext signature"
+#: src/filesigndlg.c:217
+#, fuzzy
+msgid "Clear_text signature"
 msgstr "podpis v ÄistÃ©m _textu"
 
-#: src/filesigndlg.c:165
+#: src/filesigndlg.c:223
 #, fuzzy
-msgid "_detached signature"
+msgid "_Detached signature"
 msgstr "podpis v ÄistÃ©m _textu"
 
-#: src/gpabackupop.c:213 src/gpgmetools.c:138
+#: src/gpabackupop.c:208
 #, c-format
 msgid ""
-"The file %s already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Soubor %s jiÅ¾ existuje.\n"
-"Chcete jej pÅ™epsat?"
-
-#: src/gpabackupop.c:216 src/gpaexportserverop.c:134
-#: src/gpafileencryptop.c:455 src/gpafileverifyop.c:178 src/gpgmetools.c:141
-#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:62
-#: src/settingsdlg.c:165
-msgid "_Yes"
-msgstr "_Ano"
-
-#: src/gpabackupop.c:217 src/gpaexportserverop.c:135
-#: src/gpafileencryptop.c:456 src/gpafileverifyop.c:179 src/gpgmetools.c:142
-#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:64
-#: src/settingsdlg.c:168
-msgid "_No"
-msgstr "_Ne"
-
-#: src/gpabackupop.c:229
-#, c-format
-msgid ""
 "A copy of your secret key has been made to the file:\n"
 "\n"
 "\t\"%s\"\n"
@@ -606,31 +344,19 @@
 "Toto je citlivÃ¡ informace a mÄ›la by bÃ½t bezpeÄnÄ› uloÅ¾ena\n"
 "(napÅ™. na disketÄ› na bezpeÄnÃ©m mÃstÄ›)."
 
-#: src/gpabackupop.c:244
+#: src/gpabackupop.c:223
 msgid "An error ocurred during the backup operation."
 msgstr "V prÅ¯bÄ›hu zÃ¡lohovÃ¡nÃ doÅ¡lo k chybÄ›."
 
-#: src/gpabackupop.c:260
+#: src/gpabackupop.c:245
 msgid "Backup key to file"
 msgstr "ZÃ¡lohovat klÃÄ do souboru"
 
-#: src/gpabackupop.c:287
-msgid "Backup Keys"
-msgstr "ZÃ¡lohovat klÃÄe"
-
-#: src/gpabackupop.c:311
+#: src/gpabackupop.c:255
 #, c-format
 msgid "Generating backup of key: %s"
 msgstr "VytvÃ¡Å™Ãm zÃ¡lohu klÃÄe: %s"
 
-#: src/gpabackupop.c:317
-msgid "_Backup to file:"
-msgstr "_ZÃ¡lohovat do souboru:"
-
-#: src/gpabackupop.c:329
-msgid "B_rowse..."
-msgstr "_ProchÃ¡zet"
-
 #: src/gpa.c:92
 #, fuzzy
 msgid "Output version information and exit"
@@ -652,26 +378,31 @@
 msgstr "Zur _Zwischenablage exportieren"
 
 #: src/gpa.c:100
-msgid "Start only the UI server (implies --cms)"
+#, fuzzy
+msgid "Open the settings dialog"
+msgstr "OtevÅ™Ãt dialog NastavenÃ"
+
+#: src/gpa.c:102
+msgid "Enable the UI server (implies --cms)"
 msgstr ""
 
-#: src/gpa.c:102
+#: src/gpa.c:104
 #, fuzzy
 msgid "Read options from file"
 msgstr "ÄÃst moÅ¾nosti ze souboru"
 
-#: src/gpa.c:293
+#: src/gpa.c:286
 msgid "[FILE...]"
 msgstr ""
 
-#: src/gpa.c:295
+#: src/gpa.c:288
 #, fuzzy
 msgid "Graphical frontend to GnuPG"
 msgstr ""
 "Syntaxe: gpa [moÅ¾nosti]\n"
 "GrafickÃ© rozhranÃ pro GnuPG\n"
 
-#: src/gpa.c:296
+#: src/gpa.c:289
 msgid "Please report bugs to <"
 msgstr "Nahlaste prosÃm chybu <"
 
@@ -679,15 +410,15 @@
 msgid "The keys have been copied to the clipboard."
 msgstr "KlÃÄe byly zkopÃrovÃ¡ny do schrÃ¡nky."
 
-#: src/gpaexportfileop.c:133
+#: src/gpaexportfileop.c:139
 msgid "Export public keys to file"
 msgstr "Exportovat veÅ™ejnÃ© klÃÄe do souboru"
 
-#: src/gpaexportfileop.c:137
+#: src/gpaexportfileop.c:150
 msgid "_armor"
 msgstr "ASCII-z_akÃ³dovat"
 
-#: src/gpaexportfileop.c:171
+#: src/gpaexportfileop.c:182
 #, c-format
 msgid "The keys have been exported to %s."
 msgstr "KlÃÄe byly exportovÃ¡ny do %s."
@@ -703,6 +434,18 @@
 "(\"%s\").\n"
 "UrÄitÄ› chcete Å¡ÃÅ™it tento klÃÄ?"
 
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:459
+#: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
+#: src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Ano"
+
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:460
+#: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
+#: src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_Ne"
+
 #: src/gpaexportserverop.c:187
 msgid "The keys have been sent to the server."
 msgstr "KlÃÄe byly odeslÃ¡ny na server."
@@ -711,29 +454,29 @@
 msgid "Decrypting..."
 msgstr "DeÅ¡ifruji...."
 
-#: src/gpafiledecryptop.c:358 src/gpafileverifyop.c:449
+#: src/gpafiledecryptop.c:367 src/gpafileverifyop.c:464
 #, fuzzy, c-format
 msgid "\"%s\" contained no OpenPGP data."
 msgstr "Soubor \"%s\" neobsahuje Å¾Ã¡dnÃ¡ OpenPGP data."
 
-#: src/gpafiledecryptop.c:359 src/gpafileverifyop.c:450
+#: src/gpafiledecryptop.c:368 src/gpafileverifyop.c:465
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no OpenPGPdata."
 msgstr "Soubor \"%s\" neobsahuje Å¾Ã¡dnÃ¡ OpenPGP data."
 
-#: src/gpafiledecryptop.c:369
+#: src/gpafiledecryptop.c:378
 #, fuzzy, c-format
 msgid "\"%s\" contained no valid encrypted data."
 msgstr "Soubor \"%s\" neobsahuje platnÃ¡ Å¡ifrovanÃ¡ data."
 
-#: src/gpafiledecryptop.c:371
+#: src/gpafiledecryptop.c:380
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no validencrypted data."
 msgstr "Soubor \"%s\" neobsahuje platnÃ¡ Å¡ifrovanÃ¡ data."
 
-#: src/gpafiledecryptop.c:380 src/gpafileencryptop.c:727
-#: src/gpafilesignop.c:510 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
-#: src/gpakeypasswdop.c:197 src/gpakeysignop.c:229
+#: src/gpafiledecryptop.c:389 src/gpafileencryptop.c:751
+#: src/gpafilesignop.c:525 src/gpafileverifyop.c:475 src/gpakeyexpireop.c:240
+#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:237
 msgid "Wrong passphrase!"
 msgstr "NeplatnÃ© heslo!"
 
@@ -741,61 +484,60 @@
 msgid "Encrypting..."
 msgstr "Å ifruji ..."
 
-#: src/gpafileencryptop.c:453 src/verifydlg.c:222
+#: src/gpafileencryptop.c:457 src/verifydlg.c:222
 msgid "Unknown Key"
 msgstr "NeznÃ¡mÃ½ klÃÄ"
 
-#: src/gpafileencryptop.c:469
+#: src/gpafileencryptop.c:473
 #, fuzzy
 msgid "You are going to encrypt a document using the following key:"
 msgstr "HodlÃ¡te zaÅ¡ifrovat soubor nÃ¡sledujÃcÃm klÃÄem:"
 
-#: src/gpafileencryptop.c:475
+#: src/gpafileencryptop.c:479
 msgid "However, it is not certain that the key belongs to that person."
 msgstr "NicmÃ©nÄ› nenÃ jistÃ©, Å¾e klÃÄ patÅ™Ã tÃ©to osobÄ›."
 
-#: src/gpafileencryptop.c:481
+#: src/gpafileencryptop.c:485
 msgid "Do you <b>really</b> want to use this key?"
 msgstr "<b>UrÄitÄ›</b> chcete pouÅ¾Ãt tento klÃÄ?"
 
-#: src/gpafileencryptop.c:502 src/gpafileencryptop.c:542 src/verifydlg.c:227
+#: src/gpafileencryptop.c:506 src/gpafileencryptop.c:546 src/verifydlg.c:227
 msgid "Revoked Key"
 msgstr "ZneplatnÄ›nÃ½ klÃÄ"
 
-#: src/gpafileencryptop.c:504 src/gpafileencryptop.c:544 src/gpawizard.c:281
-#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:422
-#: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
+#: src/gpafileencryptop.c:508 src/gpafileencryptop.c:548 src/gtktools.c:52
+#: src/gtktools.c:86 src/keyeditdlg.c:149 src/verifydlg.c:115
 msgid "_Close"
 msgstr "_ZavÅ™Ãt"
 
-#: src/gpafileencryptop.c:517
+#: src/gpafileencryptop.c:521
 msgid "The following key has been revoked by it's owner:"
 msgstr "NÃ¡sledujÃcÃ klÃÄ byl zneplatnÄ›n vlastnÃkem:"
 
-#: src/gpafileencryptop.c:522 src/gpafileencryptop.c:565
+#: src/gpafileencryptop.c:526 src/gpafileencryptop.c:569
 msgid "And can not be used for encryption."
 msgstr "A nemÅ¯Å¾e bÃ½t pouÅ¾it pro Å¡ifrovÃ¡nÃ."
 
-#: src/gpafileencryptop.c:557
+#: src/gpafileencryptop.c:561
 #, c-format
 msgid "The following key expired on %s:"
 msgstr "NÃ¡sledujÃcÃmu klÃÄi vyprÅ¡ela platnost %s:"
 
-#: src/gpafileencryptop.c:641 src/gpafilesignop.c:414
+#: src/gpafileencryptop.c:600 src/gpafilesignop.c:448
+msgid ""
+"The selected certificates are not all of the same type. That is, you mixed "
+"OpenPGP and X.509 certificates. Please make sure to select only certificates "
+"of the same type."
+msgstr ""
+
+#: src/gpafileencryptop.c:675 src/gpafilesignop.c:434
 msgid "You didn't select any key for signing"
 msgstr "Nevybrali jste Å¾Ã¡dnÃ½ klÃÄ pro podpis"
 
-#: src/gpafilesignop.c:148
+#: src/gpafilesignop.c:157
 msgid "Signing..."
 msgstr "Podepisuji ..."
 
-#: src/gpafilesignop.c:428
-msgid ""
-"The selected certificates are not all of the same type. That is, you mixed "
-"OpenPGP and X.509 certificates. Please make sure to select only certificates "
-"of the same type."
-msgstr ""
-
 #: src/gpafileverifyop.c:101
 msgid "Verifying..."
 msgstr "OvÄ›Å™uji ..."
@@ -817,15 +559,15 @@
 msgid "Generating Key..."
 msgstr "VytvÃ¡Å™Ãm klÃÄ ..."
 
-#: src/gpaimportfileop.c:131
+#: src/gpaimportfileop.c:132
 msgid "Import public keys from file"
 msgstr "NahrÃ¡t veÅ™ejnÃ© klÃÄe ze souboru"
 
-#: src/gpaimportop.c:197
+#: src/gpaimportop.c:196
 msgid "No keys were found."
 msgstr "Nebyly nalezeny Å¾Ã¡dnÃ© klÃÄe."
 
-#: src/gpaimportop.c:205
+#: src/gpaimportop.c:204
 #, c-format
 msgid ""
 "%i public keys read\n"
@@ -842,35 +584,35 @@
 "%i zÃskÃ¡no soukromÃ½ch klÃÄÅ¯\n"
 "%i nezmÄ›nÄ›nÃ½ch soukromÃ½ch klÃÄÅ¯"
 
-#: src/gpakeyexpireop.c:239
+#: src/gpakeyexpireop.c:244
 msgid ""
 "Invalid time given.\n"
 "(you may not set the expiration time to the past.)"
 msgstr "NeplatnÃ½ Äas.(nemÅ¯Å¾ete nastavit Äas vyprÅ¡enÃ do minulosti.)"
 
-#: src/gpakeyselector.c:86 src/keylist.c:567 src/siglist.c:94
+#: src/gpakeyselector.c:86 src/keylist.c:555 src/siglist.c:94
 #: src/siglist.c:114 src/verifydlg.c:324
 msgid "Key ID"
 msgstr "ID klÃÄe"
 
-#: src/gpakeyselector.c:95 src/keylist.c:618 src/siglist.c:100
+#: src/gpakeyselector.c:95 src/keylist.c:606 src/siglist.c:100
 #: src/siglist.c:143 src/verifydlg.c:336
 msgid "User Name"
 msgstr "JmÃ©no uÅ¾ivatele"
 
-#: src/gpakeysignop.c:188
+#: src/gpakeysignop.c:191
 msgid "No private key for signing."
 msgstr "Nebyl nalezen soukromÃ½ klÃÄ pro podpis."
 
-#: src/gpakeysignop.c:233
+#: src/gpakeysignop.c:241
 msgid "This key has expired! Unable to sign."
 msgstr "KlÃÄi vyprÅ¡ela platnost! Podpis nenÃ moÅ¾nÃ½."
 
-#: src/gpakeysignop.c:237
+#: src/gpakeysignop.c:245
 msgid "This key has already been signed with your own!"
 msgstr "Tento klÃÄ uÅ¾ jste sÃ¡m podepsal!"
 
-#: src/gpakeysignop.c:242
+#: src/gpakeysignop.c:250
 msgid "You haven't selected a default key to sign with!"
 msgstr "Nebyl vybrÃ¡n vÃ½chozÃ klÃÄ pro podepisovÃ¡nÃ!"
 
@@ -898,7 +640,7 @@
 msgid "unknown"
 msgstr "neznÃ¡mÃ¡"
 
-#: src/gparecvkeydlg.c:101
+#: src/gparecvkeydlg.c:106
 msgid "Which key do you want to import? (The key must be specified by key ID)."
 msgstr "KterÃ½ klÃÄ chcete zÃskat? (MusÃte zadat ID klÃÄe)."
 
@@ -922,7 +664,7 @@
 msgid "Size"
 msgstr "Velikost"
 
-#: src/gpasubkeylist.c:97 src/keyeditdlg.c:171 src/keylist.c:580
+#: src/gpasubkeylist.c:97 src/keyeditdlg.c:168 src/keylist.c:568
 msgid "Expiry Date"
 msgstr "Platnost do"
 
@@ -942,16 +684,16 @@
 msgid "Can authenticate"
 msgstr "SmÃ autentizovat"
 
-#: src/gpasubkeylist.c:137 src/gpgmetools.c:613 src/gpgmetools.c:821
-#: src/gpgmetools.c:940
+#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:833
+#: src/gpgmetools.c:952
 msgid "Revoked"
 msgstr "ZneplatnÄ›n"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:615 src/gpgmetools.c:936
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:948
 msgid "Expired"
 msgstr "VyprÅ¡ela platnost"
 
-#: src/gpasubkeylist.c:145 src/gpgmetools.c:617
+#: src/gpasubkeylist.c:145 src/gpgmetools.c:626
 msgid "Disabled"
 msgstr "DeaktivovanÃ½"
 
@@ -959,41 +701,41 @@
 msgid "Unsigned"
 msgstr "NepodepsanÃ½"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:927 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:939 src/verifydlg.c:212
 msgid "Valid"
 msgstr "PlatnÃ½"
 
-#: src/gpawidgets.c:72 src/gpgmetools.c:661 src/gpgmetools.c:668
-#: src/keyring.c:1176 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
+#: src/keyring.c:1248 src/keysigndlg.c:100
 msgid "User Name:"
 msgstr "JmÃ©no uÅ¾ivatele:"
 
-#: src/gpawidgets.c:72 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/keysigndlg.c:100
 msgid "User Names:"
 msgstr "JmÃ©na uÅ¾ivatelÅ¯:"
 
-#: src/gpawidgets.c:78 src/gpgmetools.c:662 src/gpgmetools.c:669
-#: src/keyring.c:1178
+#: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
+#: src/keyring.c:1250
 msgid "Key ID:"
 msgstr "ID klÃÄe:"
 
-#: src/gpawidgets.c:194
+#: src/gpawidgets.c:180
 msgid "Expiration"
 msgstr "Platnost do"
 
-#: src/gpawidgets.c:201
+#: src/gpawidgets.c:187
 msgid "_indefinitely valid"
 msgstr "_trvale platnÃ½"
 
-#: src/gpawidgets.c:210
+#: src/gpawidgets.c:195
 msgid "expire _after"
 msgstr "vyprÅ¡Ã za"
 
-#: src/gpawidgets.c:229
+#: src/gpawidgets.c:215
 msgid "expire o_n:"
 msgstr "_vyprÅ¡Ã:"
 
-#: src/gpawidgets.c:302 src/keygendlg.c:295
+#: src/gpawidgets.c:289 src/keygendlg.c:291
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -1001,19 +743,7 @@
 "!KRITICKÃ CHYBA!\n"
 "NeplatnÃ½ mÃ³d pro vklÃ¡dÃ¡nÃ data vyprÅ¡enÃ."
 
-#: src/gpawizard.c:260
-msgid "_Back"
-msgstr "_ZpÄ›t"
-
-#: src/gpawizard.c:267
-msgid "_Forward"
-msgstr "_VpÅ™ed"
-
-#: src/gpawizard.c:274
-msgid "_Apply"
-msgstr "_Potvrdit"
-
-#: src/gpgmetools.c:58
+#: src/gpgmetools.c:59
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -1030,7 +760,7 @@
 "\n"
 "Program bude ukonÄen"
 
-#: src/gpgmetools.c:72
+#: src/gpgmetools.c:73
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -1049,8 +779,17 @@
 "Toto je zÅ™ejmÄ› chyba v GPA.\n"
 "GPA se pokusÃ obnovit z chybovÃ©ho stavu."
 
-#: src/gpgmetools.c:477
+#: src/gpgmetools.c:139
+#, c-format
 msgid ""
+"The file %s already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Soubor %s jiÅ¾ existuje.\n"
+"Chcete jej pÅ™epsat?"
+
+#: src/gpgmetools.c:486
+msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
 "* a safe place.                                                        *\n"
@@ -1066,7 +805,7 @@
 "************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:482
+#: src/gpgmetools.c:491
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -1074,106 +813,106 @@
 "V souboru je zÃ¡lohovÃ¡n tento klÃÄ:\n"
 "\n"
 
-#: src/gpgmetools.c:543
+#: src/gpgmetools.c:552
 msgid "DSA and ElGamal (default)"
 msgstr "DSA a ElGamal (vÃ½chozÃ)"
 
-#: src/gpgmetools.c:544
+#: src/gpgmetools.c:553
 msgid "DSA (sign only)"
 msgstr "DSA (jen podpis)"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:554
 msgid "RSA (sign only)"
 msgstr "RSA (jen podpis)"
 
-#: src/gpgmetools.c:581 src/gpgmetools.c:604 src/gpgmetools.c:621
-#: src/gpgmetools.c:932 src/gpgmetools.c:965
+#: src/gpgmetools.c:590 src/gpgmetools.c:613 src/gpgmetools.c:630
+#: src/gpgmetools.c:944 src/gpgmetools.c:977
 msgid "Unknown"
 msgstr "NeznÃ¡mÃ¡"
 
-#: src/gpgmetools.c:584
+#: src/gpgmetools.c:593
 msgid "Never"
 msgstr "Å½Ã¡dnÃ¡"
 
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:596
 msgid "Marginal"
 msgstr "ÄŒÃ¡steÄnÃ¡"
 
-#: src/gpgmetools.c:590
+#: src/gpgmetools.c:599
 msgid "Full"
 msgstr "PlnÃ¡"
 
-#: src/gpgmetools.c:593
+#: src/gpgmetools.c:602
 msgid "Ultimate"
 msgstr "AbsolutnÃ"
 
-#: src/gpgmetools.c:619
+#: src/gpgmetools.c:628
 msgid "Incomplete"
 msgstr "NekompletnÃ"
 
-#: src/gpgmetools.c:625
+#: src/gpgmetools.c:634
 msgid "Fully Valid"
 msgstr "PlatnÃ½"
 
-#: src/gpgmetools.c:659
+#: src/gpgmetools.c:668
 msgid "Please enter the passphrase for the following key:"
 msgstr "Zadejte prosÃm heslo pro nÃ¡sledujÃcÃ klÃÄ:"
 
-#: src/gpgmetools.c:667
+#: src/gpgmetools.c:676
 msgid "Wrong passphrase, please try again:"
 msgstr "Å patnÃ© heslo, zkuste to prosÃm znovu:"
 
-#: src/gpgmetools.c:692
+#: src/gpgmetools.c:701
 msgid "Enter Passphrase"
 msgstr "Zadat heslo"
 
-#: src/gpgmetools.c:814
+#: src/gpgmetools.c:826
 msgid "[None]"
 msgstr "[Å½Ã¡dnÃ½]"
 
-#: src/gpgmetools.c:904 src/verifydlg.c:269
+#: src/gpgmetools.c:916 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[NeznÃ¡mÃ© ID uÅ¾ivatele]"
 
-#: src/gpgmetools.c:930 src/verifydlg.c:217
+#: src/gpgmetools.c:942 src/verifydlg.c:217
 msgid "Bad"
 msgstr "Å patnÃ½"
 
-#: src/gpgmetools.c:953
+#: src/gpgmetools.c:965
 msgid "Generic"
 msgstr "ObecnÃ½"
 
-#: src/gpgmetools.c:956
+#: src/gpgmetools.c:968
 msgid "Persona"
 msgstr "Persona"
 
-#: src/gpgmetools.c:959
+#: src/gpgmetools.c:971
 msgid "Casual"
 msgstr "PÅ™ibliÅ¾nÃ½"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:974
 msgid "Positive"
 msgstr "PozitivnÃ"
 
-#: src/gpgmetools.c:980
+#: src/gpgmetools.c:992
 msgid "The key can be used for certification, signing and encryption."
 msgstr "Tento klÃÄ smÃ bÃ½t pouÅ¾it pro certifikaci, podpis a Å¡ifrovÃ¡nÃ."
 
-#: src/gpgmetools.c:983
+#: src/gpgmetools.c:995
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "Tento klÃÄ smÃ bÃ½t pouÅ¾it pro certifikaci a podpis, ne vÅ¡ak pro Å¡ifrovÃ¡nÃ."
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:1001
 msgid "The key can be used for certification and encryption."
 msgstr "Tento klÃÄ smÃ bÃ½t pouÅ¾it pro certifikaci a Å¡ifrovÃ¡nÃ."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:1004
 msgid "The key can be used only for certification."
 msgstr "Tento klÃÄ smÃ bÃ½t pouÅ¾it pouze pro certifikaci."
 
-#: src/gpgmetools.c:1000
+#: src/gpgmetools.c:1012
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -1181,78 +920,70 @@
 "Tento klÃÄ smÃ bÃ½t pouÅ¾it pouze pro Å¡ifrovÃ¡nÃ a podpis, ne vÅ¡ak pro "
 "certifikaci."
 
-#: src/gpgmetools.c:1003
+#: src/gpgmetools.c:1015
 msgid "The key can be used only for signing."
 msgstr "Tento klÃÄ smÃ bÃ½t pouÅ¾it pouze pro podpis."
 
-#: src/gpgmetools.c:1008
+#: src/gpgmetools.c:1020
 msgid "The key can be used only for encryption."
 msgstr "Tento klÃÄ smÃ bÃ½t pouÅ¾it pouze pro Å¡ifrovÃ¡nÃ."
 
-#: src/gpgmetools.c:1011
+#: src/gpgmetools.c:1023
 msgid "This key is useless."
 msgstr "Tento klÃÄ je nepouÅ¾itelnÃ½."
 
-#: src/gtktools.c:320
+#: src/gtktools.c:48
 msgid "GPA Error"
 msgstr "Chyba GPA"
 
-#: src/helpmenu.c:202
+#: src/helpmenu.c:83
 msgid "About GPA"
 msgstr "O GPA"
 
-#: src/helpmenu.c:247
-msgid "Brought to you by:"
-msgstr "Program vÃ¡m pÅ™inÃ¡Å¡Ã:"
+#: src/helpmenu.c:89
+#, fuzzy
+msgid "GPA is the GNU Privacy Assistant."
+msgstr "Co je GNU Privacy Assistant"
 
-#: src/helpmenu.c:284
-msgid "GPA is Free Software under the"
-msgstr "GPA je otevÅ™enÃ½ program Å¡ÃÅ™enÃ½"
+#: src/icons.c:199
+#, fuzzy
+msgid "_Verify"
+msgstr "OvÄ›Å™it"
 
-#: src/helpmenu.c:288
-msgid "GNU General Public License."
-msgstr "pod GNU General Public License."
+#: src/icons.c:200
+msgid "_Encrypt"
+msgstr "_VerschlÃ¼sseln"
 
-#: src/helpmenu.c:292
-msgid "For news see:"
-msgstr "Novinky na:"
+#: src/icons.c:201
+#, fuzzy
+msgid "_Decrypt"
+msgstr "DeÅ¡ifrovat"
 
-#: src/helpmenu.c:297
-msgid "http://www.gpg4win.org"
-msgstr "http://www.gpg4win.org"
+#: src/icons.c:202
+#, fuzzy
+msgid "_Brief"
+msgstr "StruÄnÄ›"
 
-#: src/helpmenu.c:299
-msgid "http://www.gnupg.org"
-msgstr "http://www.gnupg.org"
+#: src/icons.c:203
+#, fuzzy
+msgid "_Detailed"
+msgstr "PodrobnÄ›"
 
-#: src/helpmenu.c:382
-msgid "GNU General Public License"
-msgstr "pod GNU General Public License."
+#: src/icons.c:204
+#, fuzzy
+msgid "_Keyring Editor"
+msgstr "SprÃ¡vce klÃÄÅ¯"
 
-#: src/helpmenu.c:409
-msgid "_GNU General Public License"
-msgstr "pod _GNU General Public License."
+#: src/icons.c:205
+#, fuzzy
+msgid "_Clipboard"
+msgstr "Zur _Zwischenablage exportieren"
 
-#: src/helpmenu.c:436
-msgid "Show Help Text\n"
-msgstr "Zobrazit test nÃ¡povÄ›dy\n"
+#: src/icons.c:206
+#, fuzzy
+msgid "_File Manager"
+msgstr "SprÃ¡vce souborÅ¯"
 
-#: src/helpmenu.c:444
-msgid "/_Help"
-msgstr "/_NÃ¡povÄ›da"
-
-#: src/helpmenu.c:446
-msgid "/Help/_Contents"
-msgstr "/NÃ¡povÄ›da/_Obsah"
-
-#: src/helpmenu.c:449
-msgid "/Help/_License"
-msgstr "/NÃ¡povÄ›da/_Licence"
-
-#: src/helpmenu.c:450
-msgid "/Help/_About"
-msgstr "/NÃ¡povÄ›da/O _programu"
-
 #: src/keydeletedlg.c:41
 msgid "Removing Secret Key"
 msgstr "OdstraÅˆuji soukromÃ½ klÃÄ"
@@ -1298,23 +1029,27 @@
 msgid "Are you sure you want to delete this key?"
 msgstr "Jste si jistÃ½, Å¾e chcete smazat tento klÃÄ?"
 
-#: src/keyeditdlg.c:149
+#: src/keyeditdlg.c:147
 msgid "Edit Key"
 msgstr "Upravit klÃÄ"
 
-#: src/keyeditdlg.c:165
+#: src/keyeditdlg.c:162
 msgid "Change _passphrase"
 msgstr "ZmÄ›nit _heslo"
 
-#: src/keyeditdlg.c:185
+#: src/keyeditdlg.c:182
 msgid "Change _expiration"
 msgstr "ZmÄ›nit _dobu platnosti"
 
-#: src/keygendlg.c:58
+#: src/keygendlg.c:67
+msgid "You must enter a key size."
+msgstr ""
+
+#: src/keygendlg.c:72
 msgid "You must enter a User ID."
 msgstr ""
 
-#: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
+#: src/keygendlg.c:77 src/passwddlg.c:45
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -1322,7 +1057,7 @@
 "Do pole \"Heslo\" and \"Opakovat heslo\",\n"
 "musÃte zadat stejnÃ½ Å™etÄ›zec."
 
-#: src/keygendlg.c:70 src/keygenwizard.c:314 src/passwddlg.c:52
+#: src/keygendlg.c:84 src/passwddlg.c:52
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1330,7 +1065,7 @@
 "Nezadali jste heslo.\n"
 "To je nutnÃ¡ pro ochranu vaÅ¡eho soukromÃ©ho klÃÄe."
 
-#: src/keygendlg.c:83 src/keygenwizard.c:328 src/passwddlg.c:65
+#: src/keygendlg.c:97 src/passwddlg.c:65
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1342,23 +1077,25 @@
 "\n"
 "Zadejte prosÃm jinÃ©."
 
-#: src/keygendlg.c:88 src/keygenwizard.c:333 src/passwddlg.c:70
+#: src/keygendlg.c:102 src/passwddlg.c:70
 msgid "_Enter new passphrase"
 msgstr "_Zadat novou heslo"
 
-#: src/keygendlg.c:89 src/keygenwizard.c:334 src/passwddlg.c:71
+#: src/keygendlg.c:104 src/passwddlg.c:71
 msgid "Take this one _anyway"
 msgstr "PouÅ¾Ãt tuto"
 
-#: src/keygendlg.c:144 src/keygenwizard.c:541
+#: src/keygendlg.c:150 src/keygenwizard.c:571 src/keygenwizard.c:584
+#: src/keygenwizard.c:594 src/keygenwizard.c:604 src/keygenwizard.c:616
+#: src/keygenwizard.c:633 src/keygenwizard.c:645
 msgid "Generate key"
 msgstr "VytvoÅ™it klÃÄ"
 
-#: src/keygendlg.c:185
+#: src/keygendlg.c:177
 msgid "_Algorithm: "
 msgstr "_Algoritmus: "
 
-#: src/keygendlg.c:197
+#: src/keygendlg.c:192
 msgid "_Key size (bits): "
 msgstr "DÃ©lka _klÃÄe (v bitech): "
 
@@ -1374,27 +1111,27 @@
 msgid "2048"
 msgstr "2048"
 
-#: src/keygendlg.c:216
+#: src/keygendlg.c:206
 msgid "_User ID: "
 msgstr "ID _uÅ¾ivatele:"
 
-#: src/keygendlg.c:226
+#: src/keygendlg.c:217
 msgid "_Email: "
 msgstr "_E-Mail: "
 
-#: src/keygendlg.c:236
+#: src/keygendlg.c:226
 msgid "_Comment: "
 msgstr "_KomentÃ¡Å™: "
 
-#: src/keygendlg.c:248
+#: src/keygendlg.c:235
 msgid "_Passphrase: "
 msgstr "_Heslo: "
 
-#: src/keygendlg.c:260
+#: src/keygendlg.c:246
 msgid "_Repeat passphrase: "
 msgstr "_Opakovat heslo: "
 
-#: src/keygenwizard.c:152
+#: src/keygenwizard.c:172
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1406,19 +1143,16 @@
 "VaÅ¡e jmÃ©no bude ÄÃ¡stÃ novÃ©ho klÃÄe.UmoÅ¾nÃ snazÅ¡Ã identifikaci klÃÄÅ¯ pro "
 "ostatnÃ."
 
-#: src/keygenwizard.c:157
+#: src/keygenwizard.c:175
 msgid "Your Name:"
 msgstr "VaÅ¡e jmÃ©no:"
 
-#: src/keygenwizard.c:170
-msgid "Please insert your name"
-msgstr "VloÅ¾te prosÃm svÃ© jmÃ©no."
-
-#: src/keygenwizard.c:183
+#: src/keygenwizard.c:211
+#, fuzzy
 msgid ""
 "Please insert your email address.\n"
 "\n"
-" Your email address will be part of the new key to make it easier for others "
+"Your email address will be part of the new key to make it easier for others "
 "to identify keys. If you have several email addresses, you can add further "
 "email adresses later."
 msgstr ""
@@ -1427,27 +1161,40 @@
 "Ta bude souÄÃ¡stÃ novÃ©ho klÃÄe. UmoÅ¾nÃ snazÅ¡Ã identifikaci klÃÄÅ¯ pro ostatnÃ. "
 "Pokud pouÅ¾ÃvÃ¡te vÃce adres,mÅ¯Å¾ete je pÅ™idat pozdÄ›ji."
 
-#: src/keygenwizard.c:190
+#: src/keygenwizard.c:215
 msgid "Your Email Address:"
 msgstr "VaÅ¡e E-Mail adresa:"
 
-#: src/keygenwizard.c:205
-msgid "Please insert your email address"
-msgstr "VloÅ¾te prosÃm e-mailovou adresu"
-
-#: src/keygenwizard.c:239
+#: src/keygenwizard.c:319
 msgid "Please choose a passphrase for the new key."
 msgstr "Vyberte prosÃm heslo pro novÃ½ klÃÄ."
 
-#: src/keygenwizard.c:248 src/passwddlg.c:108
+#: src/keygenwizard.c:326
+#, fuzzy
+msgid ""
+"In \"Passphrase\" and \"Repeat passphrase\", you must enter the same "
+"passphrase."
+msgstr ""
+"Do pole \"Heslo\" and \"Opakovat heslo\",\n"
+"musÃte zadat stejnÃ½ Å™etÄ›zec."
+
+#: src/keygenwizard.c:335
+msgid "Warning: The passphrase you have entered is not very secure."
+msgstr ""
+
+#: src/keygenwizard.c:350
+msgid "Quality: "
+msgstr ""
+
+#: src/keygenwizard.c:358 src/passwddlg.c:111
 msgid "Passphrase: "
 msgstr "Heslo: "
 
-#: src/keygenwizard.c:261 src/passwddlg.c:117
+#: src/keygenwizard.c:370 src/passwddlg.c:120
 msgid "Repeat Passphrase: "
 msgstr "Opakovat heslo: "
 
-#: src/keygenwizard.c:358
+#: src/keygenwizard.c:412
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1457,15 +1204,15 @@
 "DoporuÄujeme vÃ¡m vytvoÅ™it si zÃ¡loÅ¾nÃ kopii novÄ› vytvoÅ™enÃ©ho klÃÄe.\n"
 "Chcete vytvoÅ™it tuto zÃ¡lohu?"
 
-#: src/keygenwizard.c:367
+#: src/keygenwizard.c:420
 msgid "Create _backup copy"
 msgstr "VytvoÅ™it _zÃ¡loÅ¾nÃ kopii"
 
-#: src/keygenwizard.c:374 src/keyring.c:739 src/keyring.c:767
+#: src/keygenwizard.c:425 src/keyring.c:737 src/keyring.c:763
 msgid "Do it _later"
 msgstr "_PozdÄ›ji"
 
-#: src/keygenwizard.c:402
+#: src/keygenwizard.c:454
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1475,7 +1222,7 @@
 "\n"
 "I na vÃ½konnÃ©m poÄÃtaÄi mÅ¯Å¾e tato operace chvÃli trvat. ProsÃm vyÄkejte."
 
-#: src/keygenwizard.c:411
+#: src/keygenwizard.c:463
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1494,43 +1241,43 @@
 "GnuPG rekonstruuje databÃ¡zi dÅ¯vÄ›ry.\n"
 "Toto mÅ¯Å¾e pÃ¡r sekund trvat."
 
-#: src/keylist.c:559
+#: src/keylist.c:547
 msgid ""
 "This columns lists the type of the certificate.  A 'P' denotes OpenPGP and a "
 "'X' denotes X.509 (S/MIME)."
 msgstr ""
 
-#: src/keylist.c:568
+#: src/keylist.c:556
 #, fuzzy
 msgid "The key ID is a short number to identify a certificate."
 msgstr "Tento klÃÄ smÃ bÃ½t pouÅ¾it pouze pro certifikaci."
 
-#: src/keylist.c:581
+#: src/keylist.c:569
 msgid "The Expiry Date is the date until the certificate is valid."
 msgstr ""
 
-#: src/keylist.c:591 src/ownertrustdlg.c:122
+#: src/keylist.c:579 src/ownertrustdlg.c:123
 msgid "Owner Trust"
 msgstr "DÅ¯vÄ›ra ve vlastnÃka"
 
-#: src/keylist.c:592
+#: src/keylist.c:580
 msgid ""
 "The Owner Trust has been set by you and describes how far you trust the "
 "holder of the certificate to correctly sign (certify) other certificates.  "
 "It is only meaningful for OpenPGP."
 msgstr ""
 
-#: src/keylist.c:604
+#: src/keylist.c:592
 msgid "Validity"
 msgstr "GÃ¼ltigkeit"
 
-#: src/keylist.c:605
+#: src/keylist.c:593
 msgid ""
 "The Validity describes the trust level the system has in this certificate.  "
 "That is how sure it is that the named user is actually that user."
 msgstr ""
 
-#: src/keylist.c:619
+#: src/keylist.c:607
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
@@ -1540,7 +1287,7 @@
 msgid "No keys selected for signing."
 msgstr "Nebyl vybrÃ¡n klÃÄ pro podpis."
 
-#: src/keyring.c:734
+#: src/keyring.c:732
 msgid ""
 "You do not have a private key yet. Do you want to generate one now "
 "(recommended) or do it later?"
@@ -1548,11 +1295,11 @@
 "JeÅ¡tÄ› nemÃ¡te Å¾Ã¡dnÃ½ soukromÃ½ klÃÄ. Chcete jej vytvoÅ™it nynÃ (doporuÄeno), "
 "nebo pozdÄ›ji?"
 
-#: src/keyring.c:738
+#: src/keyring.c:736
 msgid "_Generate key now"
 msgstr "_VytvoÅ™it klÃÄ nynÃ"
 
-#: src/keyring.c:761
+#: src/keyring.c:757
 msgid ""
 "You do not have a backup copy of your private key yet. Do you want to backup "
 "your key now (recommended) or do it later?"
@@ -1560,217 +1307,209 @@
 "NemÃ¡te zÃ¡loÅ¾nÃ kopii soukromÃ©ho klÃÄe. Chcete ji vytvoÅ™it nynÃ (doporuÄeno), "
 "nebo pozdÄ›ji?"
 
-#: src/keyring.c:766
+#: src/keyring.c:762
 msgid "_Backup key now"
 msgstr "_ZÃ¡lohovat klÃÄ nynÃ"
 
-#: src/keyring.c:883
-msgid "/_Keys"
+#: src/keyring.c:886
+#, fuzzy
+msgid "_Keys"
 msgstr "/_KlÃÄe"
 
-#: src/keyring.c:884
-msgid "/Keys/_Refresh"
-msgstr "/KlÃÄe/_Aktualizovat"
-
-#: src/keyring.c:886
-msgid "/Keys/sep0"
-msgstr "/KlÃÄe/sep0"
-
 #: src/keyring.c:887
-msgid "/Keys/_New Key..."
-msgstr "/KlÃÄe/_NovÃ½ klÃÄ..."
+#, fuzzy
+msgid "_Server"
+msgstr "/_Server"
 
-#: src/keyring.c:889
-msgid "/Keys/_Delete Keys..."
-msgstr "/KlÃÄe/O_dstranit klÃÄe..."
+#: src/keyring.c:901
+#, fuzzy
+msgid "Select all certificates"
+msgstr "RÃ¼ckrufurkunde erzeugen"
 
-#: src/keyring.c:891
-msgid "/Keys/sep1"
-msgstr "/KlÃÄe/sep1"
+#: src/keyring.c:906
+msgid "Refresh the keyring"
+msgstr "Aktualizovat keyring"
 
-#: src/keyring.c:892
-msgid "/Keys/_Sign Keys..."
-msgstr "/KlÃÄe/Podep_sat klÃÄe..."
+#: src/keyring.c:907
+#, fuzzy
+msgid "_New key..."
+msgstr "/KlÃÄe/_NovÃ½ klÃÄ..."
 
-#: src/keyring.c:893
-msgid "/Keys/Set _Owner Trust..."
-msgstr "/KlÃÄe/Nastavit ÃºroveÅˆ dÅ¯_vÄ›ry..."
+#: src/keyring.c:908
+#, fuzzy
+msgid "Generate a new key"
+msgstr "VytvoÅ™it klÃÄ"
 
-#: src/keyring.c:894
-msgid "/Keys/_Edit Private Key..."
-msgstr "/KlÃÄe/Upravit soukromÃ½ klÃÄ..."
+#: src/keyring.c:909
+msgid "_Delete keys"
+msgstr "SchlÃ¼ssel _lÃ¶schen"
 
-#: src/keyring.c:895
-msgid "/Keys/sep2"
-msgstr "/KlÃÄe/sep2"
+#: src/keyring.c:910
+msgid "Remove the selected key"
+msgstr "Odstranit vybranÃ½ klÃÄ"
 
-#: src/keyring.c:896
-msgid "/Keys/_Import Keys..."
-msgstr "/KlÃÄe/_NahrÃ¡t klÃÄe..."
+#: src/keyring.c:911
+#, fuzzy
+msgid "_Sign Keys..."
+msgstr "/Podep_sat klÃÄe..."
 
-#: src/keyring.c:897
-msgid "/Keys/E_xport Keys..."
-msgstr "/KlÃÄe/E_xportovat klÃÄe..."
+#: src/keyring.c:912
+msgid "Sign the selected key"
+msgstr "Podepsat vybranÃ½ klÃÄ"
 
-#: src/keyring.c:898
-msgid "/Keys/_Backup..."
-msgstr "/KlÃÄe/ZÃ¡lohovat..."
+#: src/keyring.c:913
+#, fuzzy
+msgid "Set _Owner Trust..."
+msgstr "/Nastavit ÃºroveÅˆ dÅ¯vÄ›ry..."
 
-#: src/keyring.c:901
-msgid "/_Server"
-msgstr "/_Server"
+#: src/keyring.c:914
+#, fuzzy
+msgid "Set owner trust of the selected key"
+msgstr "Odstranit vybranÃ½ klÃÄ"
 
-#: src/keyring.c:902
-msgid "/Server/_Retrieve Keys..."
-msgstr "/Server/_ZÃskat klÃÄe..."
+#: src/keyring.c:916
+#, fuzzy
+msgid "_Edit Private Key..."
+msgstr "/Upravit soukromÃ½ klÃÄ..."
 
-#: src/keyring.c:903
-msgid "/Server/_Send Keys..."
-msgstr "/Server/_Odeslat klÃÄe..."
+#: src/keyring.c:917
+msgid "Edit the selected private key"
+msgstr "Upravit vybranÃ½ soukromÃ½ klÃÄ"
 
-#: src/keyring.c:908
+#: src/keyring.c:919
 #, fuzzy
-msgid "/Windows/_File Manager"
-msgstr "/Okna/_SprÃ¡vce souborÅ¯"
+msgid "_Import Keys..."
+msgstr "Importovat klÃÄe"
 
-#: src/keyring.c:939
-msgid "/Keys/Export Keys..."
-msgstr "/KlÃÄe/Exportovat klÃÄe..."
+#: src/keyring.c:920
+msgid "Import Keys"
+msgstr "Importovat klÃÄe"
 
-#: src/keyring.c:944
-msgid "/Keys/Delete Keys..."
-msgstr "/KlÃÄe/Odstranit klÃÄe..."
+#: src/keyring.c:921
+#, fuzzy
+msgid "E_xport Keys..."
+msgstr "/E_xportovat klÃÄe..."
 
-#: src/keyring.c:952
-msgid "/Server/Send Keys..."
-msgstr "/Server/Odeslat klÃÄe..."
+#: src/keyring.c:922
+msgid "Export Keys"
+msgstr "Exportovat klÃÄe"
 
-#: src/keyring.c:959
-msgid "/Keys/Set Owner Trust..."
-msgstr "/KlÃÄe/Nastavit ÃºroveÅˆ dÅ¯vÄ›ry..."
+#: src/keyring.c:923
+#, fuzzy
+msgid "_Backup..."
+msgstr "/_ZÃ¡lohovat..."
 
-#: src/keyring.c:966
-msgid "/Keys/Sign Keys..."
-msgstr "/KlÃÄe/Podepsat klÃÄe..."
+#: src/keyring.c:924
+#, fuzzy
+msgid "Backup key"
+msgstr "ZÃ¡lohovat klÃÄe"
 
-#: src/keyring.c:972
-msgid "/Keys/Edit Private Key..."
-msgstr "/KlÃÄe/Upravit soukromÃ½ klÃÄ..."
+#: src/keyring.c:927
+#, fuzzy
+msgid "_Retrieve Keys..."
+msgstr "/Server/_ZÃskat klÃÄe..."
 
-#: src/keyring.c:977
-msgid "/Keys/Backup..."
-msgstr "/KlÃÄe/ZÃ¡lohovat..."
+#: src/keyring.c:928
+#, fuzzy
+msgid "Retrieve keys from server"
+msgstr "SchlÃ¼ssel vom Key-Server _empfangen:"
 
-#: src/keyring.c:994
-msgid "/_Copy"
-msgstr "/KopÃrovat"
-
-#: src/keyring.c:996
-msgid "/_Paste"
-msgstr "/VloÅ¾it"
-
-#: src/keyring.c:998
-msgid "/_Delete Keys..."
-msgstr "/O_dstranit klÃÄe..."
-
-#: src/keyring.c:1001
-msgid "/_Sign Keys..."
+#: src/keyring.c:930
+#, fuzzy
+msgid "_Send Keys..."
 msgstr "/Podep_sat klÃÄe..."
 
-#: src/keyring.c:1002
-msgid "/Set _Owner Trust..."
-msgstr "/Nastavit ÃºroveÅˆ dÅ¯vÄ›ry..."
+#: src/keyring.c:931
+#, fuzzy
+msgid "Send keys to server"
+msgstr "/Odeslat klÃÄe na _server..."
 
-#: src/keyring.c:1003
-msgid "/_Edit Private Key..."
-msgstr "/Upravit soukromÃ½ klÃÄ..."
+#: src/keyring.c:937
+msgid "Show Brief Keylist"
+msgstr "Zobrazit struÄnÃ½ seznam klÃÄÅ¯"
 
-#: src/keyring.c:1005
-msgid "/E_xport Keys..."
-msgstr "/E_xportovat klÃÄe..."
+#: src/keyring.c:939
+msgid "Show Key Details"
+msgstr "Zobrazit podrobnÃ½ seznam klÃÄÅ¯"
 
-#: src/keyring.c:1006
-msgid "/Se_nd Keys to Server..."
-msgstr "/Odeslat klÃÄe na _server..."
+#: src/keyring.c:1063
+msgid "Edit"
+msgstr "Upravit"
 
-#: src/keyring.c:1007
-msgid "/_Backup..."
-msgstr "/_ZÃ¡lohovat..."
+#: src/keyring.c:1065
+msgid "Delete"
+msgstr "LÃ¶schen"
 
-#: src/keyring.c:1018
-msgid "/Set Owner Trust..."
-msgstr "/Nastavit ÃºroveÅˆ dÅ¯vÄ›ry..."
+#: src/keyring.c:1067
+msgid "Sign"
+msgstr "Podepsat"
 
-#: src/keyring.c:1025
-msgid "/Sign Keys..."
-msgstr "/Podepsat klÃÄe..."
+#: src/keyring.c:1069
+msgid "Export"
+msgstr "Exportovat"
 
-#: src/keyring.c:1031
-msgid "/Edit Private Key..."
-msgstr "/Upravit soukromÃ½ klÃÄ..."
+#: src/keyring.c:1071
+msgid "Import"
+msgstr "Importovat"
 
-#: src/keyring.c:1036
-msgid "/Backup..."
-msgstr "/ZÃ¡lohovat..."
-
-#: src/keyring.c:1106
+#: src/keyring.c:1178
 msgid "Subkeys"
 msgstr "PodklÃÄe"
 
-#: src/keyring.c:1180 src/keysigndlg.c:110
+#: src/keyring.c:1252 src/keysigndlg.c:106
 msgid "Fingerprint:"
 msgstr "Otisk:"
 
-#: src/keyring.c:1182
+#: src/keyring.c:1254
 msgid "Expires at:"
 msgstr "VyprÅ¡Ã:"
 
-#: src/keyring.c:1184
+#: src/keyring.c:1256
 msgid "Owner Trust:"
 msgstr "DÅ¯vÄ›ra ve vlastnÃka:"
 
-#: src/keyring.c:1186
+#: src/keyring.c:1258
 msgid "Key Validity:"
 msgstr "Platnost klÃÄe:"
 
-#: src/keyring.c:1188
+#: src/keyring.c:1260
 msgid "Key Type:"
 msgstr "Typ klÃÄe:"
 
-#: src/keyring.c:1190
+#: src/keyring.c:1262
 msgid "Created at:"
 msgstr "VytvoÅ™en:"
 
-#: src/keyring.c:1193
+#: src/keyring.c:1265
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: src/keyring.c:1201
+#: src/keyring.c:1273
 msgid "Show signatures on user name:"
 msgstr "Zobrazit podpisy u jmÃ©na uÅ¾ivatele:"
 
-#: src/keyring.c:1225
+#: src/keyring.c:1298
 msgid "Signatures"
 msgstr "Podpisy"
 
-#: src/keyring.c:1249
+#: src/keyring.c:1322
 msgid "The key has both a private and a public part"
 msgstr "KlÃÄ mÃ¡ soukromou i veÅ™ejnou ÄÃ¡st"
 
-#: src/keyring.c:1252
+#: src/keyring.c:1325
 msgid "The key has only a public part"
 msgstr "KlÃÄ mÃ¡ pouze veÅ™ejnou ÄÃ¡st"
 
-#: src/keyring.c:1287
+#: src/keyring.c:1360
 #, c-format
 msgid "%s %u bits"
 msgstr "%s %u bitÅ¯"
 
-#: src/keyring.c:1312
+#: src/keyring.c:1385
 msgid "No keys selected"
 msgstr "Å½Ã¡dnÃ½ klÃÄ nevybrÃ¡n"
 
-#: src/keyring.c:1315
+#: src/keyring.c:1388
 #, c-format
 msgid "%d key selected"
 msgid_plural "%d keys selected"
@@ -1778,121 +1517,37 @@
 msgstr[1] "%d klÃÄÅ¯ vybrÃ¡no"
 msgstr[2] "%d klÃÄÅ¯ vybrÃ¡no"
 
-#: src/keyring.c:1347
+#: src/keyring.c:1423
 msgid "All signatures"
 msgstr "VÅ¡echny podpisy"
 
-#: src/keyring.c:1552
-msgid "Edit"
-msgstr "Upravit"
-
-#: src/keyring.c:1553
-msgid "Edit the selected private key"
-msgstr "Upravit vybranÃ½ soukromÃ½ klÃÄ"
-
-#: src/keyring.c:1554
-msgid "edit key"
-msgstr "Upravit klÃÄ"
-
-#: src/keyring.c:1562
-msgid "Remove the selected key"
-msgstr "Odstranit vybranÃ½ klÃÄ"
-
-#: src/keyring.c:1563
-msgid "remove key"
-msgstr "odstranit klÃÄ"
-
-#: src/keyring.c:1571
-msgid "Sign the selected key"
-msgstr "Podepsat vybranÃ½ klÃÄ"
-
-#: src/keyring.c:1571
-msgid "sign key"
-msgstr "podepsat klÃÄ"
-
 #: src/keyring.c:1578
-msgid "Import"
-msgstr "Importovat"
-
-#: src/keyring.c:1579
-msgid "Import Keys"
-msgstr "Importovat klÃÄe"
-
-#: src/keyring.c:1579
-msgid "import keys"
-msgstr "zÃskat klÃÄe"
-
-#: src/keyring.c:1584
-msgid "Export"
-msgstr "Exportovat"
-
-#: src/keyring.c:1585
-msgid "Export Keys"
-msgstr "Exportovat klÃÄe"
-
-#: src/keyring.c:1585
-msgid "export keys"
-msgstr "exportovat klÃÄe"
-
-#: src/keyring.c:1598
-msgid "Brief"
-msgstr "StruÄnÄ›"
-
-#: src/keyring.c:1598
-msgid "Show Brief Keylist"
-msgstr "Zobrazit struÄnÃ½ seznam klÃÄÅ¯"
-
-#: src/keyring.c:1599
-msgid "brief"
-msgstr "struÄnÄ›"
-
-#: src/keyring.c:1610
-msgid "Detailed"
-msgstr "PodrobnÄ›"
-
-#: src/keyring.c:1610
-msgid "Show Key Details"
-msgstr "Zobrazit podrobnÃ½ seznam klÃÄÅ¯"
-
-#: src/keyring.c:1611
-msgid "detailed"
-msgstr "podrobnÄ›"
-
-#: src/keyring.c:1639
-msgid "Refresh the keyring"
-msgstr "Aktualizovat keyring"
-
-#: src/keyring.c:1640
-msgid "refresh keyring"
-msgstr "aktualizovat keyring"
-
-#: src/keyring.c:1711
 #, fuzzy
 msgid "Selected default key:"
 msgstr "VybranÃ½ vÃ½chozÃ klÃÄ:"
 
-#: src/keyring.c:1721
+#: src/keyring.c:1588
 #, fuzzy
 msgid "No default key selected in the preferences."
 msgstr "Keine zu schÃ¼tzenden Dateien ausgewÃ¤hlt."
 
-#: src/keyring.c:1833
+#: src/keyring.c:1701
 msgid "GNU Privacy Assistant - Keyring Editor"
 msgstr "GNU Privacy Assistant - SprÃ¡vce klÃÄÅ¯"
 
-#: src/keyring.c:1865
+#: src/keyring.c:1728
 msgid "Keyring Editor"
 msgstr "SprÃ¡vce klÃÄÅ¯"
 
-#: src/keysigndlg.c:60
+#: src/keysigndlg.c:59
 msgid "Sign Key"
 msgstr "Podepsat klÃÄ"
 
-#: src/keysigndlg.c:76
+#: src/keysigndlg.c:72
 msgid "Do you want to sign the following key?"
 msgstr "Chcete podepsat tento klÃÄ?"
 
-#: src/keysigndlg.c:120
+#: src/keysigndlg.c:116
 msgid ""
 "Check the name and fingerprint carefully to be sure that it really is the "
 "key you want to sign."
@@ -1900,19 +1555,19 @@
 "Zkontrolujte peÄlivÄ› jmÃ©no a otisk klÃÄe abyste se ujistili, Å¾e je to "
 "opravdu klÃÄ kterÃ½ chcete podepsat."
 
-#: src/keysigndlg.c:128
+#: src/keysigndlg.c:124
 msgid "All user names in this key will be signed."
 msgstr "VÅ¡echna jmÃ©na uÅ¾ivatele v tomto klÃÄi budou podepsÃ¡na."
 
-#: src/keysigndlg.c:134
+#: src/keysigndlg.c:130
 msgid "The key will be signed with your default private key."
 msgstr "KlÃÄ bude podepsÃ¡n vaÅ¡im vÃ½chozÃm soukromÃ½m klÃÄem."
 
-#: src/keysigndlg.c:141
+#: src/keysigndlg.c:137
 msgid "Sign only _locally"
 msgstr "Podepsat pouze _lokÃ¡lnÄ›"
 
-#: src/options.c:316
+#: src/options.c:323
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -1920,26 +1575,26 @@
 "ZvolenÃ½ vÃ½chozÃ soukromÃ½ klÃÄ jiÅ¾ nenÃ dostupnÃ½.\n"
 "GPA se pokusÃ automaticky zvolit novÃ½ vÃ½chozÃ klÃÄ."
 
-#: src/ownertrustdlg.c:106
+#: src/ownertrustdlg.c:107
 msgid "Change key ownertrust"
 msgstr "ZmÄ›nit ÃºroveÅˆ dÅ¯vÄ›ry ve vlastnÃka klÃÄe"
 
-#: src/ownertrustdlg.c:130
+#: src/ownertrustdlg.c:131
 msgid "_Unknown"
 msgstr "Ne_znÃ¡mÃ¡"
 
-#: src/ownertrustdlg.c:135
+#: src/ownertrustdlg.c:136
 msgid ""
 "You don't know how much to trust this user to verify other people's keys.\n"
 msgstr ""
 "NevÃm zda mohu vÄ›Å™it, Å¾e tento uÅ¾ivatel je schopen ovÄ›Å™it klÃÄe jinÃ½ch "
 "osob.\n"
 
-#: src/ownertrustdlg.c:145
+#: src/ownertrustdlg.c:146
 msgid "_Never"
 msgstr "Å½Ã¡d_nÃ¡"
 
-#: src/ownertrustdlg.c:150
+#: src/ownertrustdlg.c:151
 msgid ""
 "You don't trust this user at all to verify the validity of other people's "
 "keys at all.\n"
@@ -1947,11 +1602,11 @@
 "VÅ¯bec nevÄ›Å™Ãm, Å¾e tento uÅ¾ivatel je schopen sprÃ¡vnÄ› ovÄ›Å™it validitu klÃÄÅ¯ "
 "jinÃ½ch osob.\n"
 
-#: src/ownertrustdlg.c:160
+#: src/ownertrustdlg.c:161
 msgid "_Marginal"
 msgstr "ÄŒÃ¡steÄnÃ¡"
 
-#: src/ownertrustdlg.c:165
+#: src/ownertrustdlg.c:166
 msgid ""
 "You don't trust this user's ability to verify the validity of other people's "
 "keys enough to consider keys valid based on his/her sole word.\n"
@@ -1963,11 +1618,11 @@
 "jinÃ½ch osob, abych mohl povaÅ¾ovat tyto klÃÄe za dÅ¯vÄ›ryhodnÃ© pouze na zÃ¡kladÄ› "
 "jeho prohlÃ¡Å¡enÃ.\n"
 
-#: src/ownertrustdlg.c:182
+#: src/ownertrustdlg.c:183
 msgid "_Full"
 msgstr "_PlnÃ¡"
 
-#: src/ownertrustdlg.c:187
+#: src/ownertrustdlg.c:188
 msgid ""
 "You trust this user's ability to verify the validity of other people's keys "
 "so much, that you'll consider valid any key signed by him/her, provided this "
@@ -1976,11 +1631,11 @@
 "VÄ›Å™Ãm, Å¾e tento uÅ¾ivatel je schopen dostateÄnÄ› ovÄ›Å™it klÃÄe jinÃ½ch osob, "
 "abych mohl klÃÄe jÃm podepsanÃ© povaÅ¾ovat za dÅ¯vÄ›ryhodnÃ©.\n"
 
-#: src/ownertrustdlg.c:200
+#: src/ownertrustdlg.c:201
 msgid "U_ltimate"
 msgstr "AbsolutnÃ"
 
-#: src/ownertrustdlg.c:205
+#: src/ownertrustdlg.c:206
 msgid ""
 "You consider this key valid, and trust the user so much that you will "
 "consider any key signed by him/her fully valid.\n"
@@ -2071,37 +1726,149 @@
 "NenÃ dostupnÃ½ zÃ¡suvnÃ½ modul protokolu\n"
 "pro komunikaci se serverem klÃÄÅ¯."
 
-#: src/server_access.c:528 src/server_access.c:574
+#: src/server_access.c:528 src/server_access.c:572
 msgid "The keyserver you specified is not valid"
 msgstr "Zadali jste neplatnÃ½ server klÃÄÅ¯"
 
-#: src/settingsdlg.c:59
+#: src/settingsdlg.c:133 src/siglist.c:135
+msgid "Local"
+msgstr "LokÃ¡lnÃ"
+
+#: src/settingsdlg.c:134
 #, fuzzy
+msgid "Local, Keyserver"
+msgstr "An _Key-Server senden: "
+
+#: src/settingsdlg.c:135
+#, fuzzy
+msgid "Local, PKA"
+msgstr "LokÃ¡lnÃ"
+
+#: src/settingsdlg.c:136
+msgid "Local, PKA, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:137
+msgid "Local, Keyserver, PKA"
+msgstr ""
+
+#: src/settingsdlg.c:138
+#, fuzzy
+msgid "Local, kDNS"
+msgstr "LokÃ¡lnÃ"
+
+#: src/settingsdlg.c:139
+msgid "Local, kDNS, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:140
+msgid "PKA"
+msgstr ""
+
+#: src/settingsdlg.c:141
+msgid "kDNS"
+msgstr ""
+
+#: src/settingsdlg.c:142
+msgid "Custom"
+msgstr ""
+
+#: src/settingsdlg.c:208
+#, fuzzy
+msgid "<b>User interface</b>"
+msgstr "PouÅ¾Ãt rozÅ¡ÃÅ™enÃ½ mÃ³d:"
+
+#: src/settingsdlg.c:215
+#, fuzzy
+msgid "Use _advanced mode"
+msgstr "PouÅ¾Ãt rozÅ¡ÃÅ™enÃ½ mÃ³d:"
+
+#: src/settingsdlg.c:221
+#, fuzzy
+msgid "Show advanced _options"
+msgstr "Dateiaktionen anzeigen"
+
+#: src/settingsdlg.c:272
+msgid ""
+"No default key has been selected.  This may lead to problems when signing or "
+"encrypting.  For example you might later not be able to read a mail written "
+"by you and encrypted to someone else.\n"
+"\n"
+"Please consider creating your own key and select it then."
+msgstr ""
+
+#: src/settingsdlg.c:278
+msgid "Continue without a default key"
+msgstr ""
+
+#: src/settingsdlg.c:280
+#, fuzzy
+msgid "Let me select a default key"
+msgstr "VybranÃ½ vÃ½chozÃ klÃÄ:"
+
+#: src/settingsdlg.c:305
+#, fuzzy
 msgid "<b>Default _key</b>"
 msgstr "VÃ½chozÃ _klÃÄ:"
 
-#: src/settingsdlg.c:111
+#: src/settingsdlg.c:405
 #, fuzzy
 msgid "<b>Default key_server</b>"
 msgstr "VÃ½chozÃ key_server:"
 
-#: src/settingsdlg.c:158
+#: src/settingsdlg.c:602
 #, fuzzy
-msgid "<b>Use _advanced mode</b>"
-msgstr "PouÅ¾Ãt rozÅ¡ÃÅ™enÃ½ mÃ³d:"
+msgid "<b>Auto key _locate</b>"
+msgstr "VÃ½chozÃ key_server:"
 
-#: src/settingsdlg.c:193
-msgid "Settings"
-msgstr "NastavenÃ"
+#: src/settingsdlg.c:612
+msgid ""
+"The list of methods to locate keys via an email address.\n"
+"All given methods are used in turn until a matching key is found.  The "
+"supported methods are:\n"
+" Local\n"
+"   - Use the local keyring.\n"
+" Keyserver\n"
+"   - Use the default keyserver.\n"
+" PKA\n"
+"   - Use the Public Key Association.\n"
+" kDNS\n"
+"   - Use kDNS with the nameserver below.\n"
+" Custom\n"
+"   - Configured in the backend dialog.\n"
+msgstr ""
 
+#: src/settingsdlg.c:627
+msgid "Method:"
+msgstr ""
+
+#: src/settingsdlg.c:644
+msgid "The IP address of the nameserver used for the kDNS method."
+msgstr ""
+
+#: src/settingsdlg.c:646
+#, fuzzy
+msgid "kDNS Server:"
+msgstr "/_Server"
+
+#: src/settingsdlg.c:740
+#, fuzzy
+msgid "The URL given for the keyserver is not valid."
+msgstr "Zadali jste neplatnÃ½ server klÃÄÅ¯"
+
+#: src/settingsdlg.c:749
+msgid "The data given for \"Auto key locate\" is not valid."
+msgstr ""
+
+#: src/settingsdlg.c:886
+#, fuzzy
+msgid "GNU Privacy Assistant - Settings"
+msgstr "GNU Privacy Assistant - SprÃ¡vce klÃÄÅ¯"
+
 #: src/siglist.c:128
 msgid "Level"
 msgstr "ÃšroveÅˆ"
 
-#: src/siglist.c:135
-msgid "Local"
-msgstr "LokÃ¡lnÃ"
-
 #: src/verifydlg.c:116
 #, fuzzy
 msgid "Verify documents"
@@ -2129,6 +1896,372 @@
 msgid "Signatures:"
 msgstr "Podpisy:"
 
+#~ msgid "/File/C_lear"
+#~ msgstr "/Soubor/Vymazat"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Soubor/_OtevÅ™Ãt"
+
+#, fuzzy
+#~ msgid "/File/Save _As"
+#~ msgstr "/Soubor/_ZavÅ™Ãt"
+
+#~ msgid "/File/sep1"
+#~ msgstr "/Soubor/sep1"
+
+#~ msgid "/File/_Sign"
+#~ msgstr "/Soubor/Podep_sat"
+
+#~ msgid "/File/_Verify"
+#~ msgstr "/Soubor/O_vÄ›Å™it"
+
+#~ msgid "/File/_Encrypt"
+#~ msgstr "/Soubor/Å _ifrovat"
+
+#~ msgid "/File/_Decrypt"
+#~ msgstr "/Soubor/_DeÅ¡ifrovat"
+
+#~ msgid "/File/sep2"
+#~ msgstr "/Soubor/sep2"
+
+#~ msgid "/File/_Close"
+#~ msgstr "/Soubor/_ZavÅ™Ãt"
+
+#~ msgid "/File/_Quit"
+#~ msgstr "/Soubor/U_konÄit"
+
+#, fuzzy
+#~ msgid "/Edit/_Undo"
+#~ msgstr "/Upravit/KopÃrovat"
+
+#, fuzzy
+#~ msgid "/Edit/_Redo"
+#~ msgstr "/Upravit/KopÃrovat"
+
+#, fuzzy
+#~ msgid "/Edit/sep0"
+#~ msgstr "/Upravit/sep2"
+
+#, fuzzy
+#~ msgid "/Edit/Cut"
+#~ msgstr "/Upravit/KopÃrovat"
+
+#~ msgid "/Edit/_Copy"
+#~ msgstr "/Upravit/KopÃrovat"
+
+#~ msgid "/Edit/_Paste"
+#~ msgstr "/Upravit/VloÅ¾it"
+
+#, fuzzy
+#~ msgid "/Edit/_Delete"
+#~ msgstr "/Upravit/VloÅ¾it"
+
+#~ msgid "/Edit/sep1"
+#~ msgstr "/Upravit/sep1"
+
+#~ msgid "/Edit/Select _All"
+#~ msgstr "/Upravit/Vybrat vÅ¡e"
+
+#~ msgid "/Edit/sep2"
+#~ msgstr "/Upravit/sep2"
+
+#~ msgid "/Edit/Pr_eferences..."
+#~ msgstr "/Upravit/Na_stavenÃ"
+
+#, fuzzy
+#~ msgid "/Edit/_Backend Preferences..."
+#~ msgstr "/Upravit/Na_stavenÃ"
+
+#~ msgid "/_Windows"
+#~ msgstr "/_Okna"
+
+#~ msgid "/Windows/_Keyring Editor"
+#~ msgstr "/Okna/SprÃ¡vce _klÃÄÅ¯"
+
+#~ msgid "/Windows/_Filemanager"
+#~ msgstr "/Okna/_SprÃ¡vce souborÅ¯"
+
+#, fuzzy
+#~ msgid "/Windows/_Clipboard"
+#~ msgstr "/Okna/_SprÃ¡vce souborÅ¯"
+
+#~ msgid "/Edit/Copy"
+#~ msgstr "/Upravit/KopÃrovat"
+
+#, fuzzy
+#~ msgid "/Edit/Delete"
+#~ msgstr "/Upravit/Vybrat vÅ¡e"
+
+#, fuzzy
+#~ msgid "/Edit/Paste"
+#~ msgstr "/Upravit/VloÅ¾it"
+
+#~ msgid "open file"
+#~ msgstr "otevÅ™Ãt soubor"
+
+#, fuzzy
+#~ msgid "save file as"
+#~ msgstr "Datei _speichern unter: "
+
+#, fuzzy
+#~ msgid "cut the selection"
+#~ msgstr "ZaÅ¡ifrovat vybranÃ½ soubor"
+
+#, fuzzy
+#~ msgid "copy the selection"
+#~ msgstr "ZaÅ¡ifrovat vybranÃ½ soubor"
+
+#, fuzzy
+#~ msgid "paste the clipboard"
+#~ msgstr "Zur _Zwischenablage exportieren"
+
+#, fuzzy
+#~ msgid "Sign the selected text"
+#~ msgstr "Podepsat vybranÃ½ klÃÄ"
+
+#, fuzzy
+#~ msgid "verify text"
+#~ msgstr "ovÄ›Å™it soubor"
+
+#~ msgid "Encrypt"
+#~ msgstr "ZaÅ¡ifrovat"
+
+#, fuzzy
+#~ msgid "encrypt text"
+#~ msgstr "zaÅ¡ifrovat soubor"
+
+#, fuzzy
+#~ msgid "decrypt text"
+#~ msgstr "deÅ¡ifrovat soubor"
+
+#~ msgid "preferences"
+#~ msgstr "nastavenÃ"
+
+#, fuzzy
+#~ msgid "Open the keyring editor"
+#~ msgstr "otevÅ™Ãt SprÃ¡vce klÃÄÅ¯ (vÃ½chozÃ)"
+
+#, fuzzy
+#~ msgid "keyring editor"
+#~ msgstr "SprÃ¡vce klÃÄÅ¯"
+
+#, fuzzy
+#~ msgid "Open the file manager"
+#~ msgstr "OtevÅ™Ãt SprÃ¡vce souborÅ¯"
+
+#~ msgid "file manager"
+#~ msgstr "SprÃ¡vce souborÅ¯"
+
+#~ msgid "Help"
+#~ msgstr "NÃ¡povÄ›da"
+
+#~ msgid "help"
+#~ msgstr "nÃ¡povÄ›da"
+
+#~ msgid "/File/Sign"
+#~ msgstr "/Soubor/Podepsat"
+
+#~ msgid "/File/Verify"
+#~ msgstr "/Soubor/OvÄ›Å™it"
+
+#~ msgid "/File/Encrypt"
+#~ msgstr "/Soubor/Å ifrovat"
+
+#~ msgid "/File/Decrypt"
+#~ msgstr "/Soubor/DeÅ¡ifrovat"
+
+#~ msgid "close files"
+#~ msgstr "UzavÅ™Ãt soubory"
+
+#~ msgid "sign file"
+#~ msgstr "podepsat soubor"
+
+#~ msgid "verify file"
+#~ msgstr "ovÄ›Å™it soubor"
+
+#~ msgid "encrypt file"
+#~ msgstr "zaÅ¡ifrovat soubor"
+
+#~ msgid "decrypt file"
+#~ msgstr "deÅ¡ifrovat soubor"
+
+#, fuzzy
+#~ msgid "Open the clipboard"
+#~ msgstr "Zur _Zwischenablage exportieren"
+
+#, fuzzy
+#~ msgid "clipboard"
+#~ msgstr "Zur _Zwischenablage exportieren"
+
+#~ msgid "_Backup to file:"
+#~ msgstr "_ZÃ¡lohovat do souboru:"
+
+#~ msgid "B_rowse..."
+#~ msgstr "_ProchÃ¡zet"
+
+#~ msgid "_Back"
+#~ msgstr "_ZpÄ›t"
+
+#~ msgid "_Forward"
+#~ msgstr "_VpÅ™ed"
+
+#~ msgid "_Apply"
+#~ msgstr "_Potvrdit"
+
+#~ msgid "Brought to you by:"
+#~ msgstr "Program vÃ¡m pÅ™inÃ¡Å¡Ã:"
+
+#~ msgid "GPA is Free Software under the"
+#~ msgstr "GPA je otevÅ™enÃ½ program Å¡ÃÅ™enÃ½"
+
+#~ msgid "GNU General Public License."
+#~ msgstr "pod GNU General Public License."
+
+#~ msgid "For news see:"
+#~ msgstr "Novinky na:"
+
+#~ msgid "http://www.gpg4win.org"
+#~ msgstr "http://www.gpg4win.org"
+
+#~ msgid "http://www.gnupg.org"
+#~ msgstr "http://www.gnupg.org"
+
+#~ msgid "GNU General Public License"
+#~ msgstr "pod GNU General Public License."
+
+#~ msgid "_GNU General Public License"
+#~ msgstr "pod _GNU General Public License."
+
+#~ msgid "Show Help Text\n"
+#~ msgstr "Zobrazit test nÃ¡povÄ›dy\n"
+
+#~ msgid "/_Help"
+#~ msgstr "/_NÃ¡povÄ›da"
+
+#~ msgid "/Help/_Contents"
+#~ msgstr "/NÃ¡povÄ›da/_Obsah"
+
+#~ msgid "/Help/_License"
+#~ msgstr "/NÃ¡povÄ›da/_Licence"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/NÃ¡povÄ›da/O _programu"
+
+#~ msgid "Please insert your name"
+#~ msgstr "VloÅ¾te prosÃm svÃ© jmÃ©no."
+
+#~ msgid "Please insert your email address"
+#~ msgstr "VloÅ¾te prosÃm e-mailovou adresu"
+
+#~ msgid "/Keys/_Refresh"
+#~ msgstr "/KlÃÄe/_Aktualizovat"
+
+#~ msgid "/Keys/sep0"
+#~ msgstr "/KlÃÄe/sep0"
+
+#~ msgid "/Keys/_Delete Keys..."
+#~ msgstr "/KlÃÄe/O_dstranit klÃÄe..."
+
+#~ msgid "/Keys/sep1"
+#~ msgstr "/KlÃÄe/sep1"
+
+#~ msgid "/Keys/_Sign Keys..."
+#~ msgstr "/KlÃÄe/Podep_sat klÃÄe..."
+
+#~ msgid "/Keys/Set _Owner Trust..."
+#~ msgstr "/KlÃÄe/Nastavit ÃºroveÅˆ dÅ¯_vÄ›ry..."
+
+#~ msgid "/Keys/_Edit Private Key..."
+#~ msgstr "/KlÃÄe/Upravit soukromÃ½ klÃÄ..."
+
+#~ msgid "/Keys/sep2"
+#~ msgstr "/KlÃÄe/sep2"
+
+#~ msgid "/Keys/_Import Keys..."
+#~ msgstr "/KlÃÄe/_NahrÃ¡t klÃÄe..."
+
+#~ msgid "/Keys/E_xport Keys..."
+#~ msgstr "/KlÃÄe/E_xportovat klÃÄe..."
+
+#~ msgid "/Keys/_Backup..."
+#~ msgstr "/KlÃÄe/ZÃ¡lohovat..."
+
+#~ msgid "/Server/_Send Keys..."
+#~ msgstr "/Server/_Odeslat klÃÄe..."
+
+#, fuzzy
+#~ msgid "/Windows/_File Manager"
+#~ msgstr "/Okna/_SprÃ¡vce souborÅ¯"
+
+#~ msgid "/Keys/Export Keys..."
+#~ msgstr "/KlÃÄe/Exportovat klÃÄe..."
+
+#~ msgid "/Keys/Delete Keys..."
+#~ msgstr "/KlÃÄe/Odstranit klÃÄe..."
+
+#~ msgid "/Server/Send Keys..."
+#~ msgstr "/Server/Odeslat klÃÄe..."
+
+#~ msgid "/Keys/Set Owner Trust..."
+#~ msgstr "/KlÃÄe/Nastavit ÃºroveÅˆ dÅ¯vÄ›ry..."
+
+#~ msgid "/Keys/Sign Keys..."
+#~ msgstr "/KlÃÄe/Podepsat klÃÄe..."
+
+#~ msgid "/Keys/Edit Private Key..."
+#~ msgstr "/KlÃÄe/Upravit soukromÃ½ klÃÄ..."
+
+#~ msgid "/Keys/Backup..."
+#~ msgstr "/KlÃÄe/ZÃ¡lohovat..."
+
+#~ msgid "/_Copy"
+#~ msgstr "/KopÃrovat"
+
+#~ msgid "/_Paste"
+#~ msgstr "/VloÅ¾it"
+
+#~ msgid "/_Delete Keys..."
+#~ msgstr "/O_dstranit klÃÄe..."
+
+#~ msgid "/Set Owner Trust..."
+#~ msgstr "/Nastavit ÃºroveÅˆ dÅ¯vÄ›ry..."
+
+#~ msgid "/Sign Keys..."
+#~ msgstr "/Podepsat klÃÄe..."
+
+#~ msgid "/Edit Private Key..."
+#~ msgstr "/Upravit soukromÃ½ klÃÄ..."
+
+#~ msgid "/Backup..."
+#~ msgstr "/ZÃ¡lohovat..."
+
+#~ msgid "edit key"
+#~ msgstr "Upravit klÃÄ"
+
+#~ msgid "remove key"
+#~ msgstr "odstranit klÃÄ"
+
+#~ msgid "sign key"
+#~ msgstr "podepsat klÃÄ"
+
+#~ msgid "import keys"
+#~ msgstr "zÃskat klÃÄe"
+
+#~ msgid "export keys"
+#~ msgstr "exportovat klÃÄe"
+
+#~ msgid "brief"
+#~ msgstr "struÄnÄ›"
+
+#~ msgid "detailed"
+#~ msgstr "podrobnÄ›"
+
+#~ msgid "refresh keyring"
+#~ msgstr "aktualizovat keyring"
+
+#~ msgid "Settings"
+#~ msgstr "NastavenÃ"
+
 #~ msgid "Sign files"
 #~ msgstr "Podepsat soubory"
 
@@ -2211,9 +2344,6 @@
 #~ msgid "E_xport to file:"
 #~ msgstr "E_xportieren in Datei: "
 
-#~ msgid "_Key server:"
-#~ msgstr "An _Key-Server senden: "
-
 #~ msgid "Import Key"
 #~ msgstr "SchlÃ¼ssel importieren"
 
@@ -2300,10 +2430,6 @@
 #~ msgid "The currently selected filename."
 #~ msgstr "Der momentan ausgewÃ¤hlte Dateiname."
 
-#, fuzzy
-#~ msgid "Show file operations"
-#~ msgstr "Dateiaktionen anzeigen"
-
 #~ msgid "Whether buttons for creating/manipulating files should be displayed."
 #~ msgstr ""
 #~ "Sollen KnÃ¶pfe zum Erstellen bzw. Verwalten von Dateien angezeigt werden?"
@@ -2415,9 +2541,6 @@
 #~ msgid "_Delete"
 #~ msgstr "_LÃ¶schen"
 
-#~ msgid "Delete"
-#~ msgstr "LÃ¶schen"
-
 #, fuzzy
 #~ msgid ""
 #~ "The file name \"%s\" contains symbols that are not allowed in filenames"
@@ -2548,10 +2671,6 @@
 #~ "geheimer SchlÃ¼ssel."
 
 #, fuzzy
-#~ msgid "Receive key from server"
-#~ msgstr "SchlÃ¼ssel vom Key-Server _empfangen:"
-
-#, fuzzy
 #~ msgid "_Key ID: "
 #~ msgstr "SchlÃ¼sselkennung:"
 
@@ -2687,9 +2806,6 @@
 #~ msgid "Save encrypted file as"
 #~ msgstr "VerschlÃ¼sselte Datei speichern als"
 
-#~ msgid "_Encrypt"
-#~ msgstr "_VerschlÃ¼sseln"
-
 #~ msgid "Protect files by Password"
 #~ msgstr "Dateien mit Passwort schÃ¼tzen"
 
@@ -2851,18 +2967,12 @@
 #~ msgid "E_xport keys"
 #~ msgstr "SchlÃ¼ssel e_xportieren"
 
-#~ msgid "_Delete keys"
-#~ msgstr "SchlÃ¼ssel _lÃ¶schen"
-
 #~ msgid "_Edit key"
 #~ msgstr "SchlÃ¼ssel _bearbeiten"
 
 #~ msgid "No keys selected to create revocation certificate for."
 #~ msgstr "Keine SchlÃ¼ssel ausgewÃ¤hlt."
 
-#~ msgid "Generate revocation certificate"
-#~ msgstr "RÃ¼ckrufurkunde erzeugen"
-
 #~ msgid "_Secret keys"
 #~ msgstr "Geheime _SchlÃ¼ssel"
 

Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/de.po	2008-05-08 12:53:41 UTC (rev 891)
@@ -6,547 +6,299 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-03-12 12:29+0100\n"
-"PO-Revision-Date: 2008-03-12 12:52+0100\n"
-"Last-Translator: Steffen Michalek <steffen at michalek.de>\n"
+"POT-Creation-Date: 2008-05-08 14:51+0200\n"
+"PO-Revision-Date: 2008-05-08 14:49+0200\n"
+"Last-Translator: Werner Koch <wk at gnupg.org>\n"
 "Language-Team: deutsch <de at li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.0.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/clipboard.c:367 src/fileman.c:350
+#: src/clipboard.c:376 src/fileman.c:392
 msgid "Open File"
-msgstr "Datei öffnen"
+msgstr "Datei Ã¶ffnen"
 
-#: src/clipboard.c:395 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "GPA Meldung"
 
 #. TRANSLATORS: The arguments are the filename, the integer size
 #. and the unit (such as KB or MB).
-#: src/clipboard.c:412
+#: src/clipboard.c:421
 #, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
-msgstr "Die Datei »%s« ist %lli%s groß.  Möchten Sie sie wirklich öffnen?"
+msgstr "Die Datei Â»%sÂ« ist %lli%s groÃŸ.  MÃ¶chten Sie sie wirklich Ã¶ffnen?"
 
-#: src/clipboard.c:481
+#: src/clipboard.c:542
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: src/clipboard.c:522 src/clipboard.c:552 src/clipboard.c:582
-#: src/clipboard.c:612 src/clipboard.c:1113 src/fileman.c:675
-#: src/keyring.c:1657
+#: src/clipboard.c:583 src/clipboard.c:613 src/clipboard.c:643
+#: src/clipboard.c:673 src/clipboard.c:1034
 msgid "Clipboard"
 msgstr "Zwischenablage"
 
-#: src/clipboard.c:692 src/fileman.c:472 src/keyring.c:863
-msgid "/_File"
+#: src/clipboard.c:755 src/fileman.c:515 src/keyring.c:884
+msgid "_File"
 msgstr "/_Datei"
 
-#: src/clipboard.c:693 src/fileman.c:474
-msgid "/File/C_lear"
-msgstr "/Datei/_Leeren"
-
-#: src/clipboard.c:694 src/fileman.c:473
-msgid "/File/_Open"
-msgstr "/Datei/_Öffnen"
-
-#: src/clipboard.c:695
-msgid "/File/Save _As"
-msgstr "/Datei/Speichern unter"
-
-#: src/clipboard.c:697 src/fileman.c:475
-msgid "/File/sep1"
-msgstr "/Datei/sep1"
-
-#: src/clipboard.c:698 src/fileman.c:476
-msgid "/File/_Sign"
-msgstr "/Datei/_Signieren"
-
-#: src/clipboard.c:699 src/fileman.c:477
-msgid "/File/_Verify"
-msgstr "/Datei/Über_prüfen"
-
-#: src/clipboard.c:700 src/fileman.c:478
-msgid "/File/_Encrypt"
-msgstr "/Datei/_Verschlüsseln"
-
-#: src/clipboard.c:701 src/fileman.c:479
-msgid "/File/_Decrypt"
-msgstr "/Datei/_Entschlüsseln"
-
-#: src/clipboard.c:702 src/fileman.c:480
-msgid "/File/sep2"
-msgstr "/Datei/sep2"
-
-#: src/clipboard.c:703 src/fileman.c:481 src/keyring.c:864
-msgid "/File/_Close"
-msgstr "/Datei/_Fenster schließen"
-
-#: src/clipboard.c:704 src/fileman.c:482 src/keyring.c:866
-msgid "/File/_Quit"
-msgstr "/Datei/_Beenden"
-
-#: src/clipboard.c:707 src/fileman.c:485 src/keyring.c:869
-msgid "/_Edit"
+#: src/clipboard.c:756 src/fileman.c:516 src/keyring.c:885
+msgid "_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/clipboard.c:710
-msgid "/Edit/_Undo"
-msgstr "/Bearbeiten/Zurücknehmen"
+#: src/clipboard.c:760
+msgid "Clear buffer"
+msgstr "Textfeld lÃ¶schen"
 
-#: src/clipboard.c:711
-msgid "/Edit/_Redo"
-msgstr "/Bearbeiten/Wiederholen"
+#: src/clipboard.c:762 src/fileman.c:520
+msgid "Open a file"
+msgstr "Datei Ã¶ffnen"
 
-#: src/clipboard.c:712
-msgid "/Edit/sep0"
-msgstr "/Bearbeiten/sep0"
+#: src/clipboard.c:764
+msgid "Save to a file"
+msgstr "In eine Datei speichern"
 
-#: src/clipboard.c:714 src/clipboard.c:750
-msgid "/Edit/Cut"
-msgstr "/Bearbeiten/Ausschneiden"
+#: src/clipboard.c:766
+msgid "Sign buffer text"
+msgstr "Text signieren"
 
-#: src/clipboard.c:715 src/keyring.c:870
-msgid "/Edit/_Copy"
-msgstr "/Bearbeiten/_Kopieren"
+#: src/clipboard.c:768
+msgid "Check signatures of buffer text"
+msgstr "Signatur des Texts prÃ¼fen"
 
-#: src/clipboard.c:716 src/keyring.c:872
-msgid "/Edit/_Paste"
-msgstr "/Bearbeiten/Ein_fügen"
+#: src/clipboard.c:770
+msgid "Encrypt the buffer text"
+msgstr "Text verschlÃ¼sseln"
 
-#: src/clipboard.c:717
-msgid "/Edit/_Delete"
-msgstr "/Bearbeiten/Löschen"
+#: src/clipboard.c:772
+msgid "Decrypt the buffer text"
+msgstr "Text entschlÃ¼sseln"
 
-#: src/clipboard.c:718 src/keyring.c:874
-msgid "/Edit/sep1"
-msgstr "/Bearbeiten/sep1"
-
-#: src/clipboard.c:719 src/fileman.c:486 src/keyring.c:875
-msgid "/Edit/Select _All"
-msgstr "/Bearbeiten/Alle A_uswählen"
-
-#: src/clipboard.c:721 src/fileman.c:487 src/keyring.c:876
-msgid "/Edit/sep2"
-msgstr "/Bearbeiten/sep2"
-
-#: src/clipboard.c:722 src/fileman.c:488 src/keyring.c:877
-msgid "/Edit/Pr_eferences..."
-msgstr "/Bearbeiten/_Einstellungen"
-
-#: src/clipboard.c:724 src/fileman.c:490 src/keyring.c:879
-msgid "/Edit/_Backend Preferences..."
-msgstr "/Bearbeiten/Backend _Einstellungen"
-
-#: src/clipboard.c:728 src/fileman.c:494 src/keyring.c:906
-msgid "/_Windows"
-msgstr "/_Fenster"
-
-#: src/clipboard.c:729 src/fileman.c:495 src/keyring.c:907
-msgid "/Windows/_Keyring Editor"
-msgstr "/Fenster/_Schlüsselverwaltung"
-
-#: src/clipboard.c:730 src/fileman.c:496
-msgid "/Windows/_Filemanager"
-msgstr "/Fenster/_Dateiverwaltung"
-
-#: src/clipboard.c:731 src/fileman.c:497 src/keyring.c:909
-msgid "/Windows/_Clipboard"
-msgstr "/Fenster/_Zwischenablage"
-
-#: src/clipboard.c:758 src/keyring.c:948
-msgid "/Edit/Copy"
-msgstr "/Bearbeiten/Kopieren"
-
-#: src/clipboard.c:766
-msgid "/Edit/Delete"
-msgstr "/Bearbeiten/Löschen"
-
 #: src/clipboard.c:774
-msgid "/Edit/Paste"
-msgstr "/Bearbeiten/Ein_fügen"
+msgid "Close the buffer"
+msgstr "Das Fenster schliessen"
 
-#: src/clipboard.c:879
-msgid "Clear buffer"
-msgstr "Textfeld löschen"
+#: src/clipboard.c:776 src/fileman.c:534 src/keyring.c:893
+msgid "Quit the program"
+msgstr "Das Programm beenden"
 
-#: src/clipboard.c:879
-msgid "clear buffer"
-msgstr "Textfeld löschen"
+#: src/clipboard.c:782
+msgid "Undo the last action"
+msgstr "Die letzte Aktion rÃ¼ckgangig machen"
 
-#: src/clipboard.c:887 src/fileman.c:602
-msgid "Open a file"
-msgstr "Datei öffnen"
+#: src/clipboard.c:784
+msgid "Redo the last undone action"
+msgstr "Die letzte rÃ¼ckgÃ¤ngig gemachte Aktion wiederholen"
 
-#: src/clipboard.c:887 src/fileman.c:602
-msgid "open file"
-msgstr "Datei öffnen"
-
-#: src/clipboard.c:892
-msgid "Save to a file"
-msgstr "In eine Datei speichern"
-
-#: src/clipboard.c:892
-msgid "save file as"
-msgstr "Datei _speichern unter"
-
-#: src/clipboard.c:900
+#: src/clipboard.c:787
 msgid "Cut the selection"
 msgstr "Auswahl ausschneiden"
 
-#: src/clipboard.c:901
-msgid "cut the selection"
-msgstr "Auswahl ausschneiden"
-
-#: src/clipboard.c:907
+#: src/clipboard.c:789 src/keyring.c:897
 msgid "Copy the selection"
 msgstr "Auswahl kopieren"
 
-#: src/clipboard.c:908
-msgid "copy the selection"
-msgstr "Auswahl kopieren"
-
-#: src/clipboard.c:914
+#: src/clipboard.c:791 src/keyring.c:899
 msgid "Paste the clipboard"
-msgstr "Zwischenablage einfügen"
+msgstr "Zwischenablage einfÃ¼gen"
 
-#: src/clipboard.c:915
-msgid "paste the clipboard"
-msgstr "Zwischenablage einfügen"
+#: src/clipboard.c:793
+msgid "Delete the selected text"
+msgstr "GewÃ¤hlten Text lÃ¶schen"
 
-#: src/clipboard.c:925 src/fileman.c:612 src/keyring.c:1570
-msgid "Sign"
-msgstr "Signieren"
+#: src/clipboard.c:795
+msgid "Select the entire document"
+msgstr "Das gesamte Dokument auswÃ¤hlen"
 
-#: src/clipboard.c:926
-msgid "Sign the selected text"
-msgstr "Gewählten Text signieren"
-
-#: src/clipboard.c:927
-msgid "sign text"
-msgstr "Text signieren"
-
-#: src/clipboard.c:935 src/fileman.c:623
-msgid "Verify"
-msgstr "Prüfen"
-
-#: src/clipboard.c:936
-msgid "Check signatures of selected text"
-msgstr "Signatur des ausgewählten Texts prüfen"
-
-#: src/clipboard.c:937
-msgid "verify text"
-msgstr "Text prüfen"
-
-#: src/clipboard.c:945 src/fileman.c:634
-msgid "Encrypt"
-msgstr "Verschlüsseln"
-
-#: src/clipboard.c:946
-msgid "Encrypt the selected text"
-msgstr "Gewählten Text verschlüsseln"
-
-#: src/clipboard.c:947
-msgid "encrypt text"
-msgstr "Text verschlüsseln"
-
-#: src/clipboard.c:955 src/fileman.c:645
-msgid "Decrypt"
-msgstr "Entschlüsseln"
-
-#: src/clipboard.c:956
-msgid "Decrypt the selected text"
-msgstr "Gewählten Text entschlüsseln"
-
-#: src/clipboard.c:957
-msgid "decrypt text"
-msgstr "Text entschlüsseln"
-
-#: src/clipboard.c:967 src/fileman.c:658 src/keyring.c:1631
-msgid "Open the preferences dialog"
-msgstr "Öffne den Dialog für die Einstellungen"
-
-#: src/clipboard.c:968 src/fileman.c:659 src/keyring.c:1632
-msgid "preferences"
-msgstr "Einstellungen"
-
-#: src/clipboard.c:975 src/fileman.c:666
+#: src/clipboard.c:902 src/fileman.c:625
 msgid "Keyring"
-msgstr "Schlüsselverwaltung"
+msgstr "SchlÃ¼sselverwaltung"
 
-#: src/clipboard.c:976 src/fileman.c:667
-msgid "Open the keyring editor"
-msgstr "Schlüsselverwaltung öffnen"
-
-#: src/clipboard.c:977 src/fileman.c:668
-msgid "keyring editor"
-msgstr "Schlüsselverwaltung"
-
-#: src/clipboard.c:983 src/keyring.c:1648
+#: src/clipboard.c:904 src/keyring.c:1073
 msgid "Files"
 msgstr "Dateien"
 
-#: src/clipboard.c:984 src/keyring.c:1649
-msgid "Open the file manager"
-msgstr "Dateiverwaltung aufrufen"
-
-#: src/clipboard.c:985 src/keyring.c:1650
-msgid "file manager"
-msgstr "Dateiverwaltung"
-
-#: src/clipboard.c:992 src/fileman.c:684 src/keyring.c:1665
-msgid "Help"
-msgstr "Hilfe"
-
-#: src/clipboard.c:993 src/fileman.c:685 src/keyring.c:1666
-msgid "Understanding the GNU Privacy Assistant"
-msgstr "Wie funktioniert der GNU Privacy Assistant?"
-
-#: src/clipboard.c:994 src/fileman.c:686 src/keyring.c:1667
-msgid "help"
-msgstr "Hilfe"
-
-#: src/clipboard.c:1084
+#: src/clipboard.c:1004
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Privacy Assistant - Zwischenablage"
 
-#: src/confdialog.c:993
+#: src/confdialog.c:994
 msgid "<b>Main</b>"
 msgstr "<b>Allgemein</b>"
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default values"
 msgstr "Standardwerte verwenden"
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default value"
 msgstr "Standardwert verwenden"
 
-#: src/confdialog.c:1146
+#: src/confdialog.c:1147
 msgid "Do not use option"
 msgstr "Option nicht benutzen"
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom values"
 msgstr "Benutzerdefinierte Werte"
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom value"
 msgstr "Benutzerdefinierter Wert"
 
-#: src/confdialog.c:1155
+#: src/confdialog.c:1156
 msgid "Use default argument"
 msgstr "Standardargument verwenden"
 
-#: src/confdialog.c:1280
+#: src/confdialog.c:1281
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
-"Sie haben Werte geändert aber nicht angewandt.  Wenn Sie die Experten-"
-"Einstellung ändern, werden diese Veränderungen angewandt.  Möchten Sie "
+"Sie haben Werte geÃ¤ndert aber nicht angewandt.  Wenn Sie die Experten-"
+"Einstellung Ã¤ndern, werden diese VerÃ¤nderungen angewandt.  MÃ¶chten Sie "
 "fortfahren?"
 
-#: src/confdialog.c:1325
+#: src/confdialog.c:1326
 msgid "Crypto Backend Configuration"
 msgstr "Konfiguration des Krypto Backend"
 
-#: src/confdialog.c:1334
+#: src/confdialog.c:1332
 msgid "Reset"
-msgstr "Zurücksetzen"
+msgstr "ZurÃ¼cksetzen"
 
-#: src/confdialog.c:1346
+#: src/confdialog.c:1351
 msgid "Configure the tools of the GnuPG system."
 msgstr "Konfigurien SIe die Werkzeuge des GnuPG Systems."
 
-#: src/confdialog.c:1350
+#: src/confdialog.c:1355
 msgid "Level:"
 msgstr "Stufe:"
 
-#: src/confdialog.c:1359
+#: src/confdialog.c:1364
 msgid "Basic"
 msgstr "Grundlegend"
 
-#: src/confdialog.c:1360
+#: src/confdialog.c:1365
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: src/confdialog.c:1361
+#: src/confdialog.c:1366
 msgid "Expert"
 msgstr "Experte"
 
-#: src/encryptdlg.c:142 src/expirydlg.c:116 src/filesigndlg.c:133
-#: src/gpabackupop.c:292 src/gpaprogressdlg.c:146 src/gparecvkeydlg.c:96
-#: src/gpawizard.c:289 src/gpgmetools.c:696 src/keygendlg.c:149
-#: src/ownertrustdlg.c:111 src/passwddlg.c:100
-msgid "_Cancel"
-msgstr "_Abbrechen"
-
-#: src/encryptdlg.c:143
+#: src/encryptdlg.c:139
 msgid "Encrypt documents"
-msgstr "Dokumente verschlüsseln"
+msgstr "Dokumente verschlÃ¼sseln"
 
-#: src/encryptdlg.c:174
+#: src/encryptdlg.c:156
 msgid "_Public Keys"
-msgstr "öffentliche _Schlüssel"
+msgstr "Ã¶ffentliche _SchlÃ¼ssel"
 
-#: src/encryptdlg.c:177
+#: src/encryptdlg.c:179 src/icons.c:198
 msgid "_Sign"
 msgstr "Si_gnieren"
 
-#: src/encryptdlg.c:201 src/filesigndlg.c:185
+#: src/encryptdlg.c:185
 msgid "Sign _as "
 msgstr "_Signieren als"
 
-#: src/encryptdlg.c:215 src/filesigndlg.c:187
+#: src/encryptdlg.c:215 src/filesigndlg.c:227
 msgid "A_rmor"
 msgstr "ASCII-_Verpackung"
 
 #: src/expirydlg.c:64
 msgid "Please provide a correct date."
-msgstr "Bitte geben Sie ein gültiges Datum ein."
+msgstr "Bitte geben Sie ein gÃ¼ltiges Datum ein."
 
-#: src/expirydlg.c:111
+#: src/expirydlg.c:108
 msgid "Change expiry date"
-msgstr "Verfallsdatum ändern"
+msgstr "Verfallsdatum Ã¤ndern"
 
-#: src/expirydlg.c:129
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
+#: src/expirydlg.c:124
 msgid "_never expire"
 msgstr "_kein Verfallsdatum"
 
-#: src/expirydlg.c:134
+#: src/expirydlg.c:129
 msgid "_expire on:"
-msgstr "_ungültig ab:"
+msgstr "_ungÃ¼ltig ab:"
 
-#: src/fileman.c:355 src/fileman.c:953
-msgid "The file is already open."
-msgstr "Die Datei ist bereits geöffnet."
-
-#: src/fileman.c:516
-msgid "/File/Sign"
-msgstr "/Datei/_Signieren"
-
-#: src/fileman.c:521
-msgid "/File/Verify"
-msgstr "/Datei/Über_prüfen"
-
-#: src/fileman.c:526
-msgid "/File/Encrypt"
-msgstr "/Datei/_Verschlüsseln"
-
-#: src/fileman.c:531
-msgid "/File/Decrypt"
-msgstr "/Datei/_Entschlüsseln"
-
-#: src/fileman.c:606
+#: src/fileman.c:522
 msgid "Close all files"
-msgstr "Alle Dateien schließen"
+msgstr "Alle Dateien schlieÃŸen"
 
-#: src/fileman.c:606
-msgid "close files"
-msgstr "Dateien schließen"
-
-#: src/fileman.c:613
+#: src/fileman.c:524
 msgid "Sign the selected file"
-msgstr "Gewählte Datei signieren"
+msgstr "GewÃ¤hlte Datei signieren"
 
-#: src/fileman.c:614
-msgid "sign file"
-msgstr "Datei signieren"
-
-#: src/fileman.c:624
+#: src/fileman.c:526
 msgid "Check signatures of selected file"
-msgstr "Signatur der ausgewählten Datei prüfen"
+msgstr "Signatur der ausgewÃ¤hlten Datei prÃ¼fen"
 
-#: src/fileman.c:625
-msgid "verify file"
-msgstr "Datei prüfen"
-
-#: src/fileman.c:635
+#: src/fileman.c:528
 msgid "Encrypt the selected file"
-msgstr "Gewählte Datei verschlüsseln"
+msgstr "GewÃ¤hlte Datei verschlÃ¼sseln"
 
-#: src/fileman.c:636
-msgid "encrypt file"
-msgstr "Datei verschlüsseln"
-
-#: src/fileman.c:646
+#: src/fileman.c:530
 msgid "Decrypt the selected file"
-msgstr "Gewählte Datei entschlüsseln"
+msgstr "GewÃ¤hlte Datei entschlÃ¼sseln"
 
-#: src/fileman.c:647
-msgid "decrypt file"
-msgstr "Datei entschlüsseln"
+#: src/fileman.c:532
+msgid "Close the window"
+msgstr "Das Fenster schliessen"
 
-#: src/fileman.c:676 src/keyring.c:1658
-msgid "Open the clipboard"
-msgstr "Zwischenablage öffnen"
+#: src/fileman.c:538
+msgid "Select all files"
+msgstr "Alle Dateien auswÃ¤hlen"
 
-#: src/fileman.c:677 src/keyring.c:1659
-msgid "clipboard"
-msgstr "Zwischenablage"
-
-#: src/fileman.c:785
+#: src/fileman.c:731
 msgid "File"
 msgstr "Datei"
 
-#: src/fileman.c:850
+#: src/fileman.c:796
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Dateiverwaltung"
 
-#: src/fileman.c:876
+#: src/fileman.c:819
 msgid "File Manager"
 msgstr "Dateiverwaltung"
 
-#: src/filesigndlg.c:134
+#: src/fileman.c:895
+msgid "The file is already open."
+msgstr "Die Datei ist bereits geÃ¶ffnet."
+
+#: src/filesigndlg.c:171
 msgid "Sign documents"
 msgstr "Dokumente signieren"
 
-#: src/filesigndlg.c:144
-msgid "Signing Mode"
+#: src/filesigndlg.c:180
+msgid "<b>Sign _as</b>"
+msgstr "<b>Signieren als</b>"
+
+#: src/filesigndlg.c:201
+msgid "<b>Signing Mode</b>"
 msgstr "Signiermodus"
 
-#: src/filesigndlg.c:152
-msgid "si_gn and compress"
+#: src/filesigndlg.c:211
+msgid "Si_gn and compress"
 msgstr "si_gnieren und komprimieren"
 
-#: src/filesigndlg.c:158
-msgid "_cleartext signature"
+#: src/filesigndlg.c:217
+msgid "Clear_text signature"
 msgstr "_Klartextsignatur"
 
-#: src/filesigndlg.c:165
-msgid "_detached signature"
+#: src/filesigndlg.c:223
+msgid "_Detached signature"
 msgstr "_Abgetrennte Signature"
 
-#: src/gpabackupop.c:213 src/gpgmetools.c:138
+#: src/gpabackupop.c:208
 #, c-format
 msgid ""
-"The file %s already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Die Datei »%s« existiert bereits.\n"
-"Möchten Sie sie überschreiben?"
-
-#: src/gpabackupop.c:216 src/gpaexportserverop.c:134
-#: src/gpafileencryptop.c:455 src/gpafileverifyop.c:178 src/gpgmetools.c:141
-#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:62
-#: src/settingsdlg.c:165
-msgid "_Yes"
-msgstr "_Ja"
-
-#: src/gpabackupop.c:217 src/gpaexportserverop.c:135
-#: src/gpafileencryptop.c:456 src/gpafileverifyop.c:179 src/gpgmetools.c:142
-#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:64
-#: src/settingsdlg.c:168
-msgid "_No"
-msgstr "_Nein"
-
-#: src/gpabackupop.c:229
-#, c-format
-msgid ""
 "A copy of your secret key has been made to the file:\n"
 "\n"
 "\t\"%s\"\n"
@@ -554,7 +306,7 @@
 "This is sensitive information, and should be stored carefully\n"
 "(for example, in a floppy disk kept in a safe place)."
 msgstr ""
-"Eine Kopie Ihres geheimen Schlüssels wurde abgespeichert in der Datei:\n"
+"Eine Kopie Ihres geheimen SchlÃ¼ssels wurde abgespeichert in der Datei:\n"
 "\n"
 "\t\"%s\"\n"
 "\n"
@@ -562,83 +314,75 @@
 "werden\n"
 "(z.B. auf einer Diskette, die an einem sicheren Ort verwahrt wird)."
 
-#: src/gpabackupop.c:244
+#: src/gpabackupop.c:223
 msgid "An error ocurred during the backup operation."
 msgstr "Beim Erstellen der Datensicherung ist ein Fehler aufgetreten."
 
-#: src/gpabackupop.c:260
+#: src/gpabackupop.c:245
 msgid "Backup key to file"
-msgstr "_Sicherheitskopie des Schlüssels in Datei:"
+msgstr "_Sicherheitskopie des SchlÃ¼ssels in Datei:"
 
-#: src/gpabackupop.c:287
-msgid "Backup Keys"
-msgstr "Sicherheitskopien erstellen"
-
-#: src/gpabackupop.c:311
+#: src/gpabackupop.c:255
 #, c-format
 msgid "Generating backup of key: %s"
-msgstr "Sicherheitskopie von Schlüssel %s erstellen"
+msgstr "Sicherheitskopie von SchlÃ¼ssel %s erstellen"
 
-#: src/gpabackupop.c:317
-msgid "_Backup to file:"
-msgstr "_Sicherheitskopie in Datei:"
-
-#: src/gpabackupop.c:329
-msgid "B_rowse..."
-msgstr "_Durchsuchen..."
-
 #: src/gpa.c:92
 msgid "Output version information and exit"
 msgstr "Versionsinformation anzeigen und beenden"
 
 #: src/gpa.c:94
 msgid "Open keyring editor (default)"
-msgstr "Schlüsselverwaltung öffnen"
+msgstr "SchlÃ¼sselverwaltung Ã¶ffnen"
 
 #: src/gpa.c:96
 msgid "Open file manager"
-msgstr "Dateiverwaltung öffnen "
+msgstr "Dateiverwaltung Ã¶ffnen "
 
 #: src/gpa.c:98
 msgid "Open clipboard"
-msgstr "Zwischenablage öffnen"
+msgstr "Zwischenablage Ã¶ffnen"
 
 #: src/gpa.c:100
-msgid "Start only the UI server (implies --cms)"
-msgstr "Nur den UI Server starten"
+msgid "Open the settings dialog"
+msgstr "Ã–ffne den Dialog fÃ¼r die Einstellungen"
 
 #: src/gpa.c:102
+msgid "Enable the UI server (implies --cms)"
+msgstr "Den UI Server aktivieren"
+
+#: src/gpa.c:104
 msgid "Read options from file"
 msgstr "Optionen aus einer Datei lesen"
 
-#: src/gpa.c:293
+#: src/gpa.c:286
 msgid "[FILE...]"
 msgstr "[DATEI...]"
 
-#: src/gpa.c:295
+#: src/gpa.c:288
 msgid "Graphical frontend to GnuPG"
-msgstr "Grafische Benutzeroberfläche für GnuPG"
+msgstr "Grafische BenutzeroberflÃ¤che fÃ¼r GnuPG"
 
-#: src/gpa.c:296
+#: src/gpa.c:289
 msgid "Please report bugs to <"
 msgstr "Fehler bitte berichten an <"
 
 #: src/gpaexportclipop.c:139
 msgid "The keys have been copied to the clipboard."
-msgstr "Die Schlüssel wurden in die Zwischenablage kopiert."
+msgstr "Die SchlÃ¼ssel wurden in die Zwischenablage kopiert."
 
-#: src/gpaexportfileop.c:133
+#: src/gpaexportfileop.c:139
 msgid "Export public keys to file"
-msgstr "Öffentliche Schlüssel in Datei exportieren"
+msgstr "Ã–ffentliche SchlÃ¼ssel in Datei exportieren"
 
-#: src/gpaexportfileop.c:137
+#: src/gpaexportfileop.c:150
 msgid "_armor"
 msgstr "ASCII-_Verpackung"
 
-#: src/gpaexportfileop.c:171
+#: src/gpaexportfileop.c:182
 #, c-format
 msgid "The keys have been exported to %s."
-msgstr "Die Schlüssel wurden exportiert nach %s."
+msgstr "Die SchlÃ¼ssel wurden exportiert nach %s."
 
 #: src/gpaexportserverop.c:129
 #, c-format
@@ -647,108 +391,119 @@
 "server (\"%s\").\n"
 "Are you sure you want to distribute this key?"
 msgstr ""
-"Der ausgewählte Schlüssel wird an einen öffentlichen\n"
-"Schlüssel-Server (\"%s\") gesandt.\n"
-"Sind Sie sicher, dass Sie diesen Schlüssel veröffentlichen wollen?"
+"Der ausgewÃ¤hlte SchlÃ¼ssel wird an einen Ã¶ffentlichen\n"
+"SchlÃ¼ssel-Server (\"%s\") gesandt.\n"
+"Sind Sie sicher, dass Sie diesen SchlÃ¼ssel verÃ¶ffentlichen wollen?"
 
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:459
+#: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
+#: src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Ja"
+
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:460
+#: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
+#: src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_Nein"
+
 #: src/gpaexportserverop.c:187
 msgid "The keys have been sent to the server."
-msgstr "Die Schlüssel wurden zum Server gesandt."
+msgstr "Die SchlÃ¼ssel wurden zum Server gesandt."
 
 #: src/gpafiledecryptop.c:94
 msgid "Decrypting..."
-msgstr "_Entschlüsseln"
+msgstr "_EntschlÃ¼sseln"
 
-#: src/gpafiledecryptop.c:358 src/gpafileverifyop.c:449
+#: src/gpafiledecryptop.c:367 src/gpafileverifyop.c:464
 #, c-format
 msgid "\"%s\" contained no OpenPGP data."
-msgstr "\"%s\" enthält keine korrekt verschlüsselten OpenPGP-Daten."
+msgstr "\"%s\" enthÃ¤lt keine korrekt verschlÃ¼sselten OpenPGP-Daten."
 
-#: src/gpafiledecryptop.c:359 src/gpafileverifyop.c:450
+#: src/gpafiledecryptop.c:368 src/gpafileverifyop.c:465
 #, c-format
 msgid "The file \"%s\" contained no OpenPGPdata."
-msgstr "Die Datei \"%s\" enthält keine korrekt verschlüsselten OpenPGP-Daten."
+msgstr "Die Datei \"%s\" enthÃ¤lt keine korrekt verschlÃ¼sselten OpenPGP-Daten."
 
-#: src/gpafiledecryptop.c:369
+#: src/gpafiledecryptop.c:378
 #, c-format
 msgid "\"%s\" contained no valid encrypted data."
-msgstr "\"%s\" enthält keine korrekt verschlüsselten Daten."
+msgstr "\"%s\" enthÃ¤lt keine korrekt verschlÃ¼sselten Daten."
 
-#: src/gpafiledecryptop.c:371
+#: src/gpafiledecryptop.c:380
 #, c-format
 msgid "The file \"%s\" contained no validencrypted data."
-msgstr "Die Datei \"%s\" enthält keine korrekt verschlüsselten Daten."
+msgstr "Die Datei \"%s\" enthÃ¤lt keine korrekt verschlÃ¼sselten Daten."
 
-#: src/gpafiledecryptop.c:380 src/gpafileencryptop.c:727
-#: src/gpafilesignop.c:510 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
-#: src/gpakeypasswdop.c:197 src/gpakeysignop.c:229
+#: src/gpafiledecryptop.c:389 src/gpafileencryptop.c:751
+#: src/gpafilesignop.c:525 src/gpafileverifyop.c:475 src/gpakeyexpireop.c:240
+#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:237
 msgid "Wrong passphrase!"
 msgstr "Unsicherer Passwortsatz!"
 
 #: src/gpafileencryptop.c:155
 msgid "Encrypting..."
-msgstr "Verschlüsseln ..."
+msgstr "VerschlÃ¼sseln ..."
 
-#: src/gpafileencryptop.c:453 src/verifydlg.c:222
+#: src/gpafileencryptop.c:457 src/verifydlg.c:222
 msgid "Unknown Key"
-msgstr "Unbekannter Schlüssel"
+msgstr "Unbekannter SchlÃ¼ssel"
 
-#: src/gpafileencryptop.c:469
+#: src/gpafileencryptop.c:473
 msgid "You are going to encrypt a document using the following key:"
-msgstr "Wollen Sie das Dokument mit dem folgenden Schlüssel verschlüsseln?"
+msgstr "Wollen Sie das Dokument mit dem folgenden SchlÃ¼ssel verschlÃ¼sseln?"
 
-#: src/gpafileencryptop.c:475
+#: src/gpafileencryptop.c:479
 msgid "However, it is not certain that the key belongs to that person."
-msgstr "Allerdings ist nicht sicher, dass der Schlüssel dieser Person gehört."
+msgstr "Allerdings ist nicht sicher, dass der SchlÃ¼ssel dieser Person gehÃ¶rt."
 
-#: src/gpafileencryptop.c:481
+#: src/gpafileencryptop.c:485
 msgid "Do you <b>really</b> want to use this key?"
-msgstr "Wollen Sie diesen Schlüssel tatsächlich benutzen?"
+msgstr "Wollen Sie diesen SchlÃ¼ssel tatsÃ¤chlich benutzen?"
 
-#: src/gpafileencryptop.c:502 src/gpafileencryptop.c:542 src/verifydlg.c:227
+#: src/gpafileencryptop.c:506 src/gpafileencryptop.c:546 src/verifydlg.c:227
 msgid "Revoked Key"
-msgstr "Zurückgezogener Schlüssel"
+msgstr "ZurÃ¼ckgezogener SchlÃ¼ssel"
 
-#: src/gpafileencryptop.c:504 src/gpafileencryptop.c:544 src/gpawizard.c:281
-#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:422
-#: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
+#: src/gpafileencryptop.c:508 src/gpafileencryptop.c:548 src/gtktools.c:52
+#: src/gtktools.c:86 src/keyeditdlg.c:149 src/verifydlg.c:115
 msgid "_Close"
-msgstr "_Fenster schließen"
+msgstr "_Fenster schlieÃŸen"
 
-#: src/gpafileencryptop.c:517
+#: src/gpafileencryptop.c:521
 msgid "The following key has been revoked by it's owner:"
-msgstr "Der folgende Schlüssel wurde vom Besitzer zurückgezogen:"
+msgstr "Der folgende SchlÃ¼ssel wurde vom Besitzer zurÃ¼ckgezogen:"
 
-#: src/gpafileencryptop.c:522 src/gpafileencryptop.c:565
+#: src/gpafileencryptop.c:526 src/gpafileencryptop.c:569
 msgid "And can not be used for encryption."
-msgstr "und kann nicht zum Verschlüsseln benutzt werden."
+msgstr "und kann nicht zum VerschlÃ¼sseln benutzt werden."
 
-#: src/gpafileencryptop.c:557
+#: src/gpafileencryptop.c:561
 #, c-format
 msgid "The following key expired on %s:"
-msgstr "The folgende Schlüssel lief am %s aus:"
+msgstr "The folgende SchlÃ¼ssel lief am %s aus:"
 
-#: src/gpafileencryptop.c:641 src/gpafilesignop.c:414
-msgid "You didn't select any key for signing"
-msgstr "Es wurde kein Schlüssel zum Signieren ausgewählt."
-
-#: src/gpafilesignop.c:148
-msgid "Signing..."
-msgstr "Signieren ..."
-
-#: src/gpafilesignop.c:428
+#: src/gpafileencryptop.c:600 src/gpafilesignop.c:448
 msgid ""
 "The selected certificates are not all of the same type. That is, you mixed "
 "OpenPGP and X.509 certificates. Please make sure to select only certificates "
 "of the same type."
 msgstr ""
 "Die ausgewlten Zertifikate isn nicht alle vom gleichen Typ.  Sie haben\n"
-"also wohl OpenPGP als auch X.509 Zertifikate ausgewählt.  Bitte wählen\n"
+"also wohl OpenPGP als auch X.509 Zertifikate ausgewÃ¤hlt.  Bitte wÃ¤hlen\n"
 "Sie nur Zertifikate eines Typs aus."
 
+#: src/gpafileencryptop.c:675 src/gpafilesignop.c:434
+msgid "You didn't select any key for signing"
+msgstr "Es wurde kein SchlÃ¼ssel zum Signieren ausgewÃ¤hlt."
+
+#: src/gpafilesignop.c:157
+msgid "Signing..."
+msgstr "Signieren ..."
+
 #: src/gpafileverifyop.c:101
 msgid "Verifying..."
-msgstr "Prüfen ..."
+msgstr "PrÃ¼fen ..."
 
 #: src/gpafileverifyop.c:172
 #, c-format
@@ -758,24 +513,24 @@
 "\n"
 "The file found is: %s"
 msgstr ""
-"GPA hat eine Datei gefunden, welche eine Signatur von %s sein kann.  Möchten "
-"Sie stattdessen diese überprüfen?\n"
+"GPA hat eine Datei gefunden, welche eine Signatur von %s sein kann.  MÃ¶chten "
+"Sie stattdessen diese Ã¼berprÃ¼fen?\n"
 "\n"
 "Die gefundene Datei ist: %s"
 
 #: src/gpagenkeyadvop.c:80
 msgid "Generating Key..."
-msgstr "Schlüssel erzeugen..."
+msgstr "SchlÃ¼ssel erzeugen..."
 
-#: src/gpaimportfileop.c:131
+#: src/gpaimportfileop.c:132
 msgid "Import public keys from file"
-msgstr "Öffentliche Schlüssel aus Datei importieren"
+msgstr "Ã–ffentliche SchlÃ¼ssel aus Datei importieren"
 
-#: src/gpaimportop.c:197
+#: src/gpaimportop.c:196
 msgid "No keys were found."
-msgstr "Es wurde kein Schlüssel gefunden."
+msgstr "Es wurde kein SchlÃ¼ssel gefunden."
 
-#: src/gpaimportop.c:205
+#: src/gpaimportop.c:204
 #, c-format
 msgid ""
 "%i public keys read\n"
@@ -785,46 +540,46 @@
 "%i secret keys imported\n"
 "%i secret keys unchanged"
 msgstr ""
-"%i öffentliche Schlüssel gelesen\n"
-"%i öffentliche Schlüssel importiert\n"
-"%i öffentliche Schlüssel unverändert\n"
-"%i geheime Schlüssel gelesen\n"
-"%i geheime Schlüssel importiert\n"
-"%i geheime Schlüssel unverändert"
+"%i Ã¶ffentliche SchlÃ¼ssel gelesen\n"
+"%i Ã¶ffentliche SchlÃ¼ssel importiert\n"
+"%i Ã¶ffentliche SchlÃ¼ssel unverÃ¤ndert\n"
+"%i geheime SchlÃ¼ssel gelesen\n"
+"%i geheime SchlÃ¼ssel importiert\n"
+"%i geheime SchlÃ¼ssel unverÃ¤ndert"
 
-#: src/gpakeyexpireop.c:239
+#: src/gpakeyexpireop.c:244
 msgid ""
 "Invalid time given.\n"
 "(you may not set the expiration time to the past.)"
 msgstr ""
-"Ungültige Zeitangabe.\n"
-"(Sie können die Ablaufzeit nicht in die Vergangenheit setzen.)"
+"UngÃ¼ltige Zeitangabe.\n"
+"(Sie kÃ¶nnen die Ablaufzeit nicht in die Vergangenheit setzen.)"
 
-#: src/gpakeyselector.c:86 src/keylist.c:567 src/siglist.c:94
+#: src/gpakeyselector.c:86 src/keylist.c:555 src/siglist.c:94
 #: src/siglist.c:114 src/verifydlg.c:324
 msgid "Key ID"
-msgstr "Schlüsselkennung"
+msgstr "SchlÃ¼sselkennung"
 
-#: src/gpakeyselector.c:95 src/keylist.c:618 src/siglist.c:100
+#: src/gpakeyselector.c:95 src/keylist.c:606 src/siglist.c:100
 #: src/siglist.c:143 src/verifydlg.c:336
 msgid "User Name"
 msgstr "Benutzerkennung"
 
-#: src/gpakeysignop.c:188
+#: src/gpakeysignop.c:191
 msgid "No private key for signing."
-msgstr "Kein geheimer Schlüssel zum signieren."
+msgstr "Kein geheimer SchlÃ¼ssel zum signieren."
 
-#: src/gpakeysignop.c:233
+#: src/gpakeysignop.c:241
 msgid "This key has expired! Unable to sign."
-msgstr "Der Schlüssels ist abgelaufen! Signieren nicht möglich."
+msgstr "Der SchlÃ¼ssels ist abgelaufen! Signieren nicht mÃ¶glich."
 
-#: src/gpakeysignop.c:237
+#: src/gpakeysignop.c:245
 msgid "This key has already been signed with your own!"
-msgstr "Dieser Schlüssel ist bereits mit Ihrem eigenen Schlüssel signiert."
+msgstr "Dieser SchlÃ¼ssel ist bereits mit Ihrem eigenen SchlÃ¼ssel signiert."
 
-#: src/gpakeysignop.c:242
+#: src/gpakeysignop.c:250
 msgid "You haven't selected a default key to sign with!"
-msgstr "Kein Standardschlüssel zum Signieren ausgewählt."
+msgstr "Kein StandardschlÃ¼ssel zum Signieren ausgewÃ¤hlt."
 
 #: src/gpapastrings.c:33
 msgid "days"
@@ -850,31 +605,31 @@
 msgid "unknown"
 msgstr "unbekannt"
 
-#: src/gparecvkeydlg.c:101
+#: src/gparecvkeydlg.c:106
 msgid "Which key do you want to import? (The key must be specified by key ID)."
-msgstr "Welchen Schlüssel möchten Sie importieren? (Schlüsselkennung angeben)"
+msgstr "Welchen SchlÃ¼ssel mÃ¶chten Sie importieren? (SchlÃ¼sselkennung angeben)"
 
 #: src/gparecvkeydlg.c:116
 msgid "Key _ID:"
-msgstr "Schlüssel_kennung:"
+msgstr "SchlÃ¼ssel_kennung:"
 
 #: src/gpasubkeylist.c:72
 msgid "Subkey ID"
-msgstr "Kennung des untergeordneten Schlüssels"
+msgstr "Kennung des untergeordneten SchlÃ¼ssels"
 
 #: src/gpasubkeylist.c:78 src/siglist.c:120 src/verifydlg.c:330
 msgid "Status"
-msgstr "Gültigkeit der Beglaubigung"
+msgstr "GÃ¼ltigkeit der Beglaubigung"
 
 #: src/gpasubkeylist.c:84
 msgid "Algorithm"
-msgstr "_Verschlüsselungsalgorithmus"
+msgstr "_VerschlÃ¼sselungsalgorithmus"
 
 #: src/gpasubkeylist.c:91
 msgid "Size"
-msgstr "Größe"
+msgstr "GrÃ¶ÃŸe"
 
-#: src/gpasubkeylist.c:97 src/keyeditdlg.c:171 src/keylist.c:580
+#: src/gpasubkeylist.c:97 src/keyeditdlg.c:168 src/keylist.c:568
 msgid "Expiry Date"
 msgstr "Verfallsdatum"
 
@@ -884,26 +639,26 @@
 
 #: src/gpasubkeylist.c:110
 msgid "Can certify"
-msgstr "Zum Überprüfen verwendbar"
+msgstr "Zum ÃœberprÃ¼fen verwendbar"
 
 #: src/gpasubkeylist.c:117
 msgid "Can encrypt"
-msgstr "Zum Verschlüsseln verwendbar"
+msgstr "Zum VerschlÃ¼sseln verwendbar"
 
 #: src/gpasubkeylist.c:124
 msgid "Can authenticate"
 msgstr "Zum Autentifizieren verwendbar"
 
-#: src/gpasubkeylist.c:137 src/gpgmetools.c:613 src/gpgmetools.c:821
-#: src/gpgmetools.c:940
+#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:833
+#: src/gpgmetools.c:952
 msgid "Revoked"
 msgstr "Widerrufen"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:615 src/gpgmetools.c:936
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:948
 msgid "Expired"
 msgstr "Abgelaufen"
 
-#: src/gpasubkeylist.c:145 src/gpgmetools.c:617
+#: src/gpasubkeylist.c:145 src/gpgmetools.c:626
 msgid "Disabled"
 msgstr "Deaktiviert"
 
@@ -911,61 +666,49 @@
 msgid "Unsigned"
 msgstr "Nicht beglaubigt"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:927 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:939 src/verifydlg.c:212
 msgid "Valid"
-msgstr "Gültig"
+msgstr "GÃ¼ltig"
 
-#: src/gpawidgets.c:72 src/gpgmetools.c:661 src/gpgmetools.c:668
-#: src/keyring.c:1176 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
+#: src/keyring.c:1248 src/keysigndlg.c:100
 msgid "User Name:"
 msgstr "Benutzerkennung:"
 
-#: src/gpawidgets.c:72 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/keysigndlg.c:100
 msgid "User Names:"
 msgstr "Benutzernamen:"
 
-#: src/gpawidgets.c:78 src/gpgmetools.c:662 src/gpgmetools.c:669
-#: src/keyring.c:1178
+#: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
+#: src/keyring.c:1250
 msgid "Key ID:"
-msgstr "Schlüsselkennung:"
+msgstr "SchlÃ¼sselkennung:"
 
-#: src/gpawidgets.c:194
+#: src/gpawidgets.c:180
 msgid "Expiration"
 msgstr "Verfallsdatum"
 
-#: src/gpawidgets.c:201
+#: src/gpawidgets.c:187
 msgid "_indefinitely valid"
-msgstr "_unbegrenzt gültig"
+msgstr "_unbegrenzt gÃ¼ltig"
 
-#: src/gpawidgets.c:210
+#: src/gpawidgets.c:195
 msgid "expire _after"
-msgstr "verfällt _nach"
+msgstr "verfÃ¤llt _nach"
 
-#: src/gpawidgets.c:229
+#: src/gpawidgets.c:215
 msgid "expire o_n:"
-msgstr "_wird ungültig am:"
+msgstr "_wird ungÃ¼ltig am:"
 
-#: src/gpawidgets.c:302 src/keygendlg.c:295
+#: src/gpawidgets.c:289 src/keygendlg.c:291
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
 msgstr ""
 "!FATALER FEHLER!\n"
-"Ungültiger Eingabemodus für das Verfallsdatum."
+"UngÃ¼ltiger Eingabemodus fÃ¼r das Verfallsdatum."
 
-#: src/gpawizard.c:260
-msgid "_Back"
-msgstr "_Zurück"
-
-#: src/gpawizard.c:267
-msgid "_Forward"
-msgstr "_Weiter"
-
-#: src/gpawizard.c:274
-msgid "_Apply"
-msgstr "_Anwenden"
-
-#: src/gpgmetools.c:58
+#: src/gpgmetools.c:59
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -982,7 +725,7 @@
 "\n"
 "Die Anwendung wird abgebrochen."
 
-#: src/gpgmetools.c:72
+#: src/gpgmetools.c:73
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -994,15 +737,24 @@
 "GPA will now try to recover from this error."
 msgstr ""
 "Die GPGME-Biblothek gab eine unerwartete\n"
-"Fehlermeldung zurück:\n"
+"Fehlermeldung zurÃ¼ck:\n"
 "\n"
 "\t%s\n"
 "\n"
 "Dies ist wahrscheinlich ein Fehler in GPA.\n"
 "GPA versucht nun, sich davon wieder zu erholen."
 
-#: src/gpgmetools.c:477
+#: src/gpgmetools.c:139
+#, c-format
 msgid ""
+"The file %s already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Die Datei Â»%sÂ« existiert bereits.\n"
+"MÃ¶chten Sie sie Ã¼berschreiben?"
+
+#: src/gpgmetools.c:486
+msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
 "* a safe place.                                                        *\n"
@@ -1010,207 +762,191 @@
 "\n"
 msgstr ""
 "************************************************************************\n"
-"* ACHTUNG: Diese Datei enthält eine Sicherheitskopie Ihres             *\n"
-"*          geheimen Schlüssels.                                        *\n"
+"* ACHTUNG: Diese Datei enthÃ¤lt eine Sicherheitskopie Ihres             *\n"
+"*          geheimen SchlÃ¼ssels.                                        *\n"
 "* Bewahren Sie sie an einem sicheren Ort auf.                          *\n"
 "************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:482
+#: src/gpgmetools.c:491
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
 msgstr ""
-"Der in dieser Datei gesicherte Schlüssel ist:\n"
+"Der in dieser Datei gesicherte SchlÃ¼ssel ist:\n"
 "\n"
 
-#: src/gpgmetools.c:543
+#: src/gpgmetools.c:552
 msgid "DSA and ElGamal (default)"
 msgstr "DSA und ElGamal (Voreinstellung)"
 
-#: src/gpgmetools.c:544
+#: src/gpgmetools.c:553
 msgid "DSA (sign only)"
 msgstr "DSA (nur signieren)"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:554
 msgid "RSA (sign only)"
 msgstr "RSA (nur signieren)"
 
-#: src/gpgmetools.c:581 src/gpgmetools.c:604 src/gpgmetools.c:621
-#: src/gpgmetools.c:932 src/gpgmetools.c:965
+#: src/gpgmetools.c:590 src/gpgmetools.c:613 src/gpgmetools.c:630
+#: src/gpgmetools.c:944 src/gpgmetools.c:977
 msgid "Unknown"
 msgstr "unbekannt"
 
-#: src/gpgmetools.c:584
+#: src/gpgmetools.c:593
 msgid "Never"
 msgstr "niemals"
 
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:596
 msgid "Marginal"
-msgstr "geringfügig"
+msgstr "geringfÃ¼gig"
 
-#: src/gpgmetools.c:590
+#: src/gpgmetools.c:599
 msgid "Full"
-msgstr "vollständig"
+msgstr "vollstÃ¤ndig"
 
-#: src/gpgmetools.c:593
+#: src/gpgmetools.c:602
 msgid "Ultimate"
 msgstr "Ultimativ"
 
-#: src/gpgmetools.c:619
+#: src/gpgmetools.c:628
 msgid "Incomplete"
-msgstr "unvollständig"
+msgstr "unvollstÃ¤ndig"
 
-#: src/gpgmetools.c:625
+#: src/gpgmetools.c:634
 msgid "Fully Valid"
-msgstr "voll gültig"
+msgstr "voll gÃ¼ltig"
 
-#: src/gpgmetools.c:659
+#: src/gpgmetools.c:668
 msgid "Please enter the passphrase for the following key:"
-msgstr "Bitte geben Sie den Passwortsatz für den folgenden Schlüssel ein:"
+msgstr "Bitte geben Sie den Passwortsatz fÃ¼r den folgenden SchlÃ¼ssel ein:"
 
-#: src/gpgmetools.c:667
+#: src/gpgmetools.c:676
 msgid "Wrong passphrase, please try again:"
 msgstr "Falscher Passwortsatz, bitte versuchen Sie es erneut:"
 
-#: src/gpgmetools.c:692
+#: src/gpgmetools.c:701
 msgid "Enter Passphrase"
 msgstr "Passwortsatz eingeben"
 
-#: src/gpgmetools.c:814
+#: src/gpgmetools.c:826
 msgid "[None]"
 msgstr "[Keine]"
 
-#: src/gpgmetools.c:904 src/verifydlg.c:269
+#: src/gpgmetools.c:916 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[Unbekannte Benutzerkennung]"
 
-#: src/gpgmetools.c:930 src/verifydlg.c:217
+#: src/gpgmetools.c:942 src/verifydlg.c:217
 msgid "Bad"
-msgstr "Ungültig"
+msgstr "UngÃ¼ltig"
 
-#: src/gpgmetools.c:953
+#: src/gpgmetools.c:965
 msgid "Generic"
 msgstr "Generisch"
 
-#: src/gpgmetools.c:956
+#: src/gpgmetools.c:968
 msgid "Persona"
 msgstr "Persona"
 
-#: src/gpgmetools.c:959
+#: src/gpgmetools.c:971
 msgid "Casual"
-msgstr "Beiläufig"
+msgstr "BeilÃ¤ufig"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:974
 msgid "Positive"
 msgstr "Positiv"
 
-#: src/gpgmetools.c:980
+#: src/gpgmetools.c:992
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
-"Der Schlüssel kann zur Zertifizierung, zum Signieren und zur Verschlüsselung "
+"Der SchlÃ¼ssel kann zur Zertifizierung, zum Signieren und zur VerschlÃ¼sselung "
 "verwendet werden."
 
-#: src/gpgmetools.c:983
+#: src/gpgmetools.c:995
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
-"Der Schlüssel kann zur Zertifizierung und zum Signieren verwendet werden, "
-"nicht aber zur Verschlüsselung."
+"Der SchlÃ¼ssel kann zur Zertifizierung und zum Signieren verwendet werden, "
+"nicht aber zur VerschlÃ¼sselung."
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:1001
 msgid "The key can be used for certification and encryption."
 msgstr ""
-"Der Schlüssel kann zur Zertifizierung und zur Verschlüsselung verwendet "
+"Der SchlÃ¼ssel kann zur Zertifizierung und zur VerschlÃ¼sselung verwendet "
 "werden."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:1004
 msgid "The key can be used only for certification."
-msgstr "Der Schlüssel ist ausschließlich zum Zertifizieren verwendbar."
+msgstr "Der SchlÃ¼ssel ist ausschlieÃŸlich zum Zertifizieren verwendbar."
 
-#: src/gpgmetools.c:1000
+#: src/gpgmetools.c:1012
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
 msgstr ""
-"Der Schlüssel ist nur zum Signieren und Verschlüsseln verwendbar, nicht aber "
+"Der SchlÃ¼ssel ist nur zum Signieren und VerschlÃ¼sseln verwendbar, nicht aber "
 "zum Zertifizieren."
 
-#: src/gpgmetools.c:1003
+#: src/gpgmetools.c:1015
 msgid "The key can be used only for signing."
-msgstr "Der Schlüssel ist ausschließlich zum Signieren verwendbar."
+msgstr "Der SchlÃ¼ssel ist ausschlieÃŸlich zum Signieren verwendbar."
 
-#: src/gpgmetools.c:1008
+#: src/gpgmetools.c:1020
 msgid "The key can be used only for encryption."
-msgstr "Der Schlüssel ist ausschließlich zum Verschlüsseln verwendbar."
+msgstr "Der SchlÃ¼ssel ist ausschlieÃŸlich zum VerschlÃ¼sseln verwendbar."
 
-#: src/gpgmetools.c:1011
+#: src/gpgmetools.c:1023
 msgid "This key is useless."
-msgstr "Dieser Schlüssel ist nicht verwendbar."
+msgstr "Dieser SchlÃ¼ssel ist nicht verwendbar."
 
-#: src/gtktools.c:320
+#: src/gtktools.c:48
 msgid "GPA Error"
 msgstr "GPA Fehler"
 
-#: src/helpmenu.c:202
+#: src/helpmenu.c:83
 msgid "About GPA"
-msgstr "Über GPA"
+msgstr "Ãœber GPA"
 
-#: src/helpmenu.c:247
-msgid "Brought to you by:"
-msgstr "Ermöglicht durch die Arbeit von:"
+#: src/helpmenu.c:89
+msgid "GPA is the GNU Privacy Assistant."
+msgstr "GPA is der GNU Privacy Assistant"
 
-#: src/helpmenu.c:284
-msgid "GPA is Free Software under the"
-msgstr "GPA ist Freie Software unter der"
+#: src/icons.c:199
+msgid "_Verify"
+msgstr "PrÃ¼fen"
 
-#: src/helpmenu.c:288
-msgid "GNU General Public License."
-msgstr "GNU General Public License."
+#: src/icons.c:200
+msgid "_Encrypt"
+msgstr "_VerschlÃ¼sseln"
 
-#: src/helpmenu.c:292
-msgid "For news see:"
-msgstr "Aktuelle Informationen finden Sie unter:"
+#: src/icons.c:201
+msgid "_Decrypt"
+msgstr "EntschlÃ¼sseln"
 
-#: src/helpmenu.c:297
-msgid "http://www.gpg4win.org"
-msgstr "http://www.gpg4win.de"
+#: src/icons.c:202
+msgid "_Brief"
+msgstr "Ãœbersicht"
 
-#: src/helpmenu.c:299
-msgid "http://www.gnupg.org"
-msgstr "http://www.gnupg.de"
+#: src/icons.c:203
+msgid "_Detailed"
+msgstr "Details"
 
-#: src/helpmenu.c:382
-msgid "GNU General Public License"
-msgstr "GNU General Public License."
+#: src/icons.c:204
+msgid "_Keyring Editor"
+msgstr "SchlÃ¼sselverwaltung"
 
-#: src/helpmenu.c:409
-msgid "_GNU General Public License"
-msgstr "_GNU General Public License."
+#: src/icons.c:205
+msgid "_Clipboard"
+msgstr "Zwischenablage"
 
-#: src/helpmenu.c:436
-msgid "Show Help Text\n"
-msgstr "Hilfe anzeigen\n"
+#: src/icons.c:206
+msgid "_File Manager"
+msgstr "Dateiverwaltung"
 
-#: src/helpmenu.c:444
-msgid "/_Help"
-msgstr "/_Hilfe"
-
-#: src/helpmenu.c:446
-msgid "/Help/_Contents"
-msgstr "/Hilfe/_Inhalt"
-
-#: src/helpmenu.c:449
-msgid "/Help/_License"
-msgstr "/Hilfe/_Lizenz"
-
-#: src/helpmenu.c:450
-msgid "/Help/_About"
-msgstr "/Hilfe/_Über GPA"
-
 #: src/keydeletedlg.c:41
 msgid "Removing Secret Key"
-msgstr "Geheimen Schlüssel entfernen"
+msgstr "Geheimen SchlÃ¼ssel entfernen"
 
 #: src/keydeletedlg.c:55
 msgid ""
@@ -1219,26 +955,26 @@
 "\n"
 "Are you really sure you want to delete it?"
 msgstr ""
-"Wenn Sie diesen Schlüssel entfernen, können Sie keine\n"
-"Nachrichten mehr lesen, die damit verschlüsselt wurden.\n"
+"Wenn Sie diesen SchlÃ¼ssel entfernen, kÃ¶nnen Sie keine\n"
+"Nachrichten mehr lesen, die damit verschlÃ¼sselt wurden.\n"
 "\n"
 "Wollen sie ihn wirklich entfernen?"
 
 #: src/keydeletedlg.c:91
 msgid "Remove Key"
-msgstr "Schlüssel entfernen"
+msgstr "SchlÃ¼ssel entfernen"
 
 #: src/keydeletedlg.c:104
 msgid "You have selected the following key for removal:"
-msgstr "Folgender Schlüssel wurde zum Löschen ausgewählt:"
+msgstr "Folgender SchlÃ¼ssel wurde zum LÃ¶schen ausgewÃ¤hlt:"
 
 #: src/keydeletedlg.c:114
 msgid ""
 "This key has a secret key. Deleting this key cannot be undone, unless you "
 "have a backup copy."
 msgstr ""
-"Dieser Schlüssel gehört zu einem geheimen Schlüssel. Ein Löschen dieses "
-"Schlüssels kann ohne eine Sicherheitskopie nicht rückgängig gemacht werden."
+"Dieser SchlÃ¼ssel gehÃ¶rt zu einem geheimen SchlÃ¼ssel. Ein LÃ¶schen dieses "
+"SchlÃ¼ssels kann ohne eine Sicherheitskopie nicht rÃ¼ckgÃ¤ngig gemacht werden."
 
 #: src/keydeletedlg.c:123
 msgid ""
@@ -1246,49 +982,53 @@
 "although you may be able to get a new copy  from the owner or from a key "
 "server."
 msgstr ""
-"Dies ist ein öffentlicher Schlüssel. Ein Löschen kann nicht so leicht "
-"rückgängig gemacht werden, es sei denn, Sie bekommen eine neue Kopie vom "
-"Eigentümer oder von einem Key-Server."
+"Dies ist ein Ã¶ffentlicher SchlÃ¼ssel. Ein LÃ¶schen kann nicht so leicht "
+"rÃ¼ckgÃ¤ngig gemacht werden, es sei denn, Sie bekommen eine neue Kopie vom "
+"EigentÃ¼mer oder von einem Key-Server."
 
 #: src/keydeletedlg.c:132
 msgid "Are you sure you want to delete this key?"
-msgstr "Wollen Sie diesen Schlüssel wirklich löschen?"
+msgstr "Wollen Sie diesen SchlÃ¼ssel wirklich lÃ¶schen?"
 
-#: src/keyeditdlg.c:149
+#: src/keyeditdlg.c:147
 msgid "Edit Key"
-msgstr "Schlüssel bearbeiten"
+msgstr "SchlÃ¼ssel bearbeiten"
 
-#: src/keyeditdlg.c:165
+#: src/keyeditdlg.c:162
 msgid "Change _passphrase"
-msgstr "_Passwortsatz ändern"
+msgstr "_Passwortsatz Ã¤ndern"
 
-#: src/keyeditdlg.c:185
+#: src/keyeditdlg.c:182
 msgid "Change _expiration"
-msgstr "_Verfallsdatum ändern"
+msgstr "_Verfallsdatum Ã¤ndern"
 
-#: src/keygendlg.c:58
+#: src/keygendlg.c:67
+msgid "You must enter a key size."
+msgstr "Sie mÃ¼ssen eine SchlÃ¼ssellÃ¤nge angeben."
+
+#: src/keygendlg.c:72
 msgid "You must enter a User ID."
-msgstr "Sie müssen eine Benutzerkennung angeben."
+msgstr "Sie mÃ¼ssen eine Benutzerkennung angeben."
 
-#: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
+#: src/keygendlg.c:77 src/passwddlg.c:45
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
 msgstr ""
-"Bitte achten Sie darauf, daß Sie in die Felder\n"
+"Bitte achten Sie darauf, daÃŸ Sie in die Felder\n"
 "\"Passwortsatz\" und \"Passwortsatz wiederholen\"\n"
 "genau den selben Passwortsatz eingeben."
 
-#: src/keygendlg.c:70 src/keygenwizard.c:314 src/passwddlg.c:52
+#: src/keygendlg.c:84 src/passwddlg.c:52
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
 msgstr ""
 "Sie haben keinen Passwortsatz eingegeben.\n"
-"Dieser wird aber benötigt, um Ihren geheimen\n"
-"Schlüssel vor unbefugtem Zugriff zu schützen."
+"Dieser wird aber benÃ¶tigt, um Ihren geheimen\n"
+"SchlÃ¼ssel vor unbefugtem Zugriff zu schÃ¼tzen."
 
-#: src/keygendlg.c:83 src/keygenwizard.c:328 src/passwddlg.c:65
+#: src/keygendlg.c:97 src/passwddlg.c:65
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1300,25 +1040,27 @@
 "\n"
 "Bitte geben Sie einen neuen Passwortsatz ein."
 
-#: src/keygendlg.c:88 src/keygenwizard.c:333 src/passwddlg.c:70
+#: src/keygendlg.c:102 src/passwddlg.c:70
 msgid "_Enter new passphrase"
 msgstr "_Neuen Passwortsatz eingeben"
 
-#: src/keygendlg.c:89 src/keygenwizard.c:334 src/passwddlg.c:71
+#: src/keygendlg.c:104 src/passwddlg.c:71
 msgid "Take this one _anyway"
 msgstr "Diesen _trotzdem verwenden"
 
-#: src/keygendlg.c:144 src/keygenwizard.c:541
+#: src/keygendlg.c:150 src/keygenwizard.c:571 src/keygenwizard.c:584
+#: src/keygenwizard.c:594 src/keygenwizard.c:604 src/keygenwizard.c:616
+#: src/keygenwizard.c:633 src/keygenwizard.c:645
 msgid "Generate key"
-msgstr "Schlüssel erzeugen"
+msgstr "SchlÃ¼ssel erzeugen"
 
-#: src/keygendlg.c:185
+#: src/keygendlg.c:177
 msgid "_Algorithm: "
-msgstr "_Verschlüsselungsalgorithmus: "
+msgstr "_VerschlÃ¼sselungsalgorithmus: "
 
-#: src/keygendlg.c:197
+#: src/keygendlg.c:192
 msgid "_Key size (bits): "
-msgstr "_Schlüssellänge (Bit): "
+msgstr "_SchlÃ¼ssellÃ¤nge (Bit): "
 
 #: src/keygendlg.c:198
 msgid "768"
@@ -1332,27 +1074,27 @@
 msgid "2048"
 msgstr "2048"
 
-#: src/keygendlg.c:216
+#: src/keygendlg.c:206
 msgid "_User ID: "
 msgstr "_Benutzerkennung: "
 
-#: src/keygendlg.c:226
+#: src/keygendlg.c:217
 msgid "_Email: "
 msgstr "_E-Mail: "
 
-#: src/keygendlg.c:236
+#: src/keygendlg.c:226
 msgid "_Comment: "
 msgstr "_Kommentar: "
 
-#: src/keygendlg.c:248
+#: src/keygendlg.c:235
 msgid "_Passphrase: "
 msgstr "_Passwortsatz: "
 
-#: src/keygendlg.c:260
+#: src/keygendlg.c:246
 msgid "_Repeat passphrase: "
 msgstr "_Passwortsatz wiederholen: "
 
-#: src/keygenwizard.c:152
+#: src/keygenwizard.c:172
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1361,51 +1103,60 @@
 msgstr ""
 "Bitte geben Sie Ihren Namen an.\n"
 "\n"
-"Ihre Korrespondenzpartner können Ihren Schlüssel anhand Ihres Namens finden."
+"Ihre Korrespondenzpartner kÃ¶nnen Ihren SchlÃ¼ssel anhand Ihres Namens finden."
 
-#: src/keygenwizard.c:157
+#: src/keygenwizard.c:175
 msgid "Your Name:"
 msgstr "Ihr Name:"
 
-#: src/keygenwizard.c:170
-msgid "Please insert your name"
-msgstr "Bitte geben Sie Ihren Namen an."
-
-#: src/keygenwizard.c:183
+#: src/keygenwizard.c:211
 msgid ""
 "Please insert your email address.\n"
 "\n"
-" Your email address will be part of the new key to make it easier for others "
+"Your email address will be part of the new key to make it easier for others "
 "to identify keys. If you have several email addresses, you can add further "
 "email adresses later."
 msgstr ""
 "Bitte geben Sie Ihre E-Mail-Adresse an.\n"
 "\n"
-"Ihre E-Mail-Adresse wird Teil des Schlüssels und erleichtert Ihren "
-"Korrespondenzpartner daher, Ihren Schlüssel zu identifizieren.\n"
-"Falls Sie mehrere E-Mail-Adressen haben, können Sie diese später hinzufügen."
+"Ihre E-Mail-Adresse wird Teil des SchlÃ¼ssels und erleichtert Ihren "
+"Korrespondenzpartner daher, Ihren SchlÃ¼ssel zu identifizieren.\n"
+"Falls Sie mehrere E-Mail-Adressen haben, kÃ¶nnen Sie diese spÃ¤ter hinzufÃ¼gen."
 
-#: src/keygenwizard.c:190
+#: src/keygenwizard.c:215
 msgid "Your Email Address:"
 msgstr "Ihre E-Mail-Adresse:"
 
-#: src/keygenwizard.c:205
-msgid "Please insert your email address"
-msgstr "Bitte geben Sie Ihre E-Mail-Adresse an"
-
-#: src/keygenwizard.c:239
+#: src/keygenwizard.c:319
 msgid "Please choose a passphrase for the new key."
-msgstr "Bitte geben Sie den Passwortsatz für Ihren neuen Schlüssel an:"
+msgstr "Bitte geben Sie den Passwortsatz fÃ¼r Ihren neuen SchlÃ¼ssel an:"
 
-#: src/keygenwizard.c:248 src/passwddlg.c:108
+#: src/keygenwizard.c:326
+msgid ""
+"In \"Passphrase\" and \"Repeat passphrase\", you must enter the same "
+"passphrase."
+msgstr ""
+"Bitte achten Sie darauf, daÃŸ Sie in die Felder\n"
+"\"Passwortsatz\" und \"Passwortsatz wiederholen\"\n"
+"genau den selben Passwortsatz eingeben."
+
+#: src/keygenwizard.c:335
+msgid "Warning: The passphrase you have entered is not very secure."
+msgstr "WARNING: Der angegebene Passwortsatz ist nicht wirklich sicher."
+
+#: src/keygenwizard.c:350
+msgid "Quality: "
+msgstr "GÃ¼te: "
+
+#: src/keygenwizard.c:358 src/passwddlg.c:111
 msgid "Passphrase: "
 msgstr "Passwortsatz: "
 
-#: src/keygenwizard.c:261 src/passwddlg.c:117
+#: src/keygenwizard.c:370 src/passwddlg.c:120
 msgid "Repeat Passphrase: "
 msgstr "Passwortsatz wiederholen: "
 
-#: src/keygenwizard.c:358
+#: src/keygenwizard.c:412
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1413,68 +1164,70 @@
 "Do you want to create a backup copy?"
 msgstr ""
 "Sie sollten jetzt angeben, wohin Sie eine Sicherheitskopie Ihres neuen "
-"Schlüssels speichern möchten, sobald er erzeugt wurde. Wir empfehlen die "
+"SchlÃ¼ssels speichern mÃ¶chten, sobald er erzeugt wurde. Wir empfehlen die "
 "Sicherung auf einer Diskette (Laufwerk A:\\).\n"
-"Möchten Sie eine Sicherheitskopie anlegen?"
+"MÃ¶chten Sie eine Sicherheitskopie anlegen?"
 
-#: src/keygenwizard.c:367
+#: src/keygenwizard.c:420
 msgid "Create _backup copy"
 msgstr "_Sicherheitskopie anlegen"
 
-#: src/keygenwizard.c:374 src/keyring.c:739 src/keyring.c:767
+#: src/keygenwizard.c:425 src/keyring.c:737 src/keyring.c:763
 msgid "Do it _later"
-msgstr "Später _erledigen"
+msgstr "SpÃ¤ter _erledigen"
 
-#: src/keygenwizard.c:402
+#: src/keygenwizard.c:454
 msgid ""
 "Your key is being generated.\n"
 "\n"
 "Even on fast computers this may take a while. Please be patient."
 msgstr ""
-"Ihr Schlüssel wird erstellt.\n"
+"Ihr SchlÃ¼ssel wird erstellt.\n"
 "\n"
 "Dies kann auch auf schnellen Computern etwas dauern. Bitte haben Sie Geduld."
 
-#: src/keygenwizard.c:411
+#: src/keygenwizard.c:463
 msgid ""
 "Congratulations!\n"
 "\n"
 "You have successfully generated a key. The key is indefinitely valid and has "
 "a length of 1024 bits."
 msgstr ""
-"Herzlichen Glückwunsch!\n"
-"Sie haben erfolgreich Ihren neuen Schlüssel erzeugt. Dieser Schlüssel hat "
-"eine Länge von 1024 Bit und ist auf unbegrenzte Zeit gültig."
+"Herzlichen GlÃ¼ckwunsch!\n"
+"Sie haben erfolgreich Ihren neuen SchlÃ¼ssel erzeugt. Dieser SchlÃ¼ssel hat "
+"eine LÃ¤nge von 1024 Bit und ist auf unbegrenzte Zeit gÃ¼ltig."
 
 #: src/keylist.c:342
 msgid ""
 "GnuPG is rebuilding the trust database.\n"
 "This might take a few seconds."
 msgstr ""
-"GnuPG stellt die Verlässlichkeits-Datenbank wieder her.\n"
+"GnuPG stellt die VerlÃ¤sslichkeits-Datenbank wieder her.\n"
 "Das kann einige Sekunden dauern."
 
-#: src/keylist.c:559
+#: src/keylist.c:547
 msgid ""
 "This columns lists the type of the certificate.  A 'P' denotes OpenPGP and a "
 "'X' denotes X.509 (S/MIME)."
 msgstr ""
-"Diese Spalte beschreibt den Typ des Zertifikats. Ein 'P' steht für\n"
-"OpenPGP und ein 'X' für X.509 (S/MIME). "
+"Diese Spalte beschreibt den Typ des Zertifikats. Ein 'P' steht fÃ¼r\n"
+"OpenPGP und ein 'X' fÃ¼r X.509 (S/MIME). "
 
-#: src/keylist.c:568
+#: src/keylist.c:556
 msgid "The key ID is a short number to identify a certificate."
-msgstr "Die Schlüsselkennung (Key ID) is eine kurze Zahl zur Identifizerung eines Zertifikats."
+msgstr ""
+"Die SchlÃ¼sselkennung (Key ID) is eine kurze Zahl zur Identifizerung eines "
+"Zertifikats."
 
-#: src/keylist.c:581
+#: src/keylist.c:569
 msgid "The Expiry Date is the date until the certificate is valid."
-msgstr "Das Ablaufdatum ist das Datum bis zu dem das Zertifikat gültig ist."
+msgstr "Das Ablaufdatum ist das Datum bis zu dem das Zertifikat gÃ¼ltig ist."
 
-#: src/keylist.c:591 src/ownertrustdlg.c:122
+#: src/keylist.c:579 src/ownertrustdlg.c:123
 msgid "Owner Trust"
 msgstr "Benutzervertrauen"
 
-#: src/keylist.c:592
+#: src/keylist.c:580
 msgid ""
 "The Owner Trust has been set by you and describes how far you trust the "
 "holder of the certificate to correctly sign (certify) other certificates.  "
@@ -1482,442 +1235,336 @@
 msgstr ""
 "Das Benutzervertrauen wird von Ihnen gesetzt und beschreibt inwieweit\n"
 "Sie dem Inhaber des Zertifikats vertrauen, andere Zertifikate korrekt\n"
-"zu unterschreiben (zertifizieren).  Dieser Wert ist nur für OpenPGP\n"
+"zu unterschreiben (zertifizieren).  Dieser Wert ist nur fÃ¼r OpenPGP\n"
 "relevant."
 
-#: src/keylist.c:604
+#: src/keylist.c:592
 msgid "Validity"
-msgstr "Gültigkeit"
+msgstr "GÃ¼ltigkeit"
 
-#: src/keylist.c:605
+#: src/keylist.c:593
 msgid ""
 "The Validity describes the trust level the system has in this certificate.  "
 "That is how sure it is that the named user is actually that user."
 msgstr ""
-"Die Gültigkeit beschreibt wieviel Vertrauen das System in dieses\n"
-"Zertifikat steckt.  Also, wie sicher es ist, daß die benannte Person\n"
+"Die GÃ¼ltigkeit beschreibt wieviel Vertrauen das System in dieses\n"
+"Zertifikat steckt.  Also, wie sicher es ist, daÃŸ die benannte Person\n"
 "wirklich diese Person ist. "
 
-#: src/keylist.c:619
+#: src/keylist.c:607
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
-msgstr "Der Benutzername is der im Zertifikat gespeicherte Name sowie die Email-Adresse."
+msgstr ""
+"Der Benutzername is der im Zertifikat gespeicherte Name sowie die Email-"
+"Adresse."
 
 #: src/keyring.c:457
 msgid "No keys selected for signing."
-msgstr "Keine Schlüssel ausgewählt."
+msgstr "Keine SchlÃ¼ssel ausgewÃ¤hlt."
 
-#: src/keyring.c:734
+#: src/keyring.c:732
 msgid ""
 "You do not have a private key yet. Do you want to generate one now "
 "(recommended) or do it later?"
 msgstr ""
-"Sie haben noch keinen geheimen Schlüssel. Wollen Sie jetzt einen erzeugen "
-"(empfohlen), oder dies später erledigen?"
+"Sie haben noch keinen geheimen SchlÃ¼ssel. Wollen Sie jetzt einen erzeugen "
+"(empfohlen), oder dies spÃ¤ter erledigen?"
 
-#: src/keyring.c:738
+#: src/keyring.c:736
 msgid "_Generate key now"
-msgstr "Jetzt Schlüssel _erzeugen"
+msgstr "Jetzt SchlÃ¼ssel _erzeugen"
 
-#: src/keyring.c:761
+#: src/keyring.c:757
 msgid ""
 "You do not have a backup copy of your private key yet. Do you want to backup "
 "your key now (recommended) or do it later?"
 msgstr ""
-"Sie haben noch keine Sicherheitskopie Ihres geheimen Schlüssels. Wollen Sie "
-"jetzt einen Sicherheitskopie anlegen (empfohlen), oder dies später erledigen?"
+"Sie haben noch keine Sicherheitskopie Ihres geheimen SchlÃ¼ssels. Wollen Sie "
+"jetzt einen Sicherheitskopie anlegen (empfohlen), oder dies spÃ¤ter erledigen?"
 
-#: src/keyring.c:766
+#: src/keyring.c:762
 msgid "_Backup key now"
 msgstr "_Sicherheitskopie anlegen"
 
-#: src/keyring.c:883
-msgid "/_Keys"
-msgstr "/_Schlüssel"
-
-#: src/keyring.c:884
-msgid "/Keys/_Refresh"
-msgstr "/Schlüssel/Auf_frischen"
-
 #: src/keyring.c:886
-msgid "/Keys/sep0"
-msgstr "/Schlüssel/sep0"
+msgid "_Keys"
+msgstr "/_SchlÃ¼ssel"
 
 #: src/keyring.c:887
-msgid "/Keys/_New Key..."
-msgstr "/Schlüssel/_Neuer Schlüssel..."
+msgid "_Server"
+msgstr "/_Server"
 
-#: src/keyring.c:889
-msgid "/Keys/_Delete Keys..."
-msgstr "/Schlüssel/_Löschen..."
+#: src/keyring.c:901
+msgid "Select all certificates"
+msgstr "Alle Zertifikate auswÃ¤hlen"
 
-#: src/keyring.c:891
-msgid "/Keys/sep1"
-msgstr "/Schlüssel/sep1"
+#: src/keyring.c:906
+msgid "Refresh the keyring"
+msgstr "SchlÃ¼sselbund auffrischen"
 
-#: src/keyring.c:892
-msgid "/Keys/_Sign Keys..."
-msgstr "/Schlüssel/_Signieren..."
+#: src/keyring.c:907
+msgid "_New key..."
+msgstr "_Neuer SchlÃ¼ssel..."
 
-#: src/keyring.c:893
-msgid "/Keys/Set _Owner Trust..."
-msgstr "/Schlüssel/_Vertrauen einstellen..."
+#: src/keyring.c:908
+msgid "Generate a new key"
+msgstr "SchlÃ¼ssel erzeugen"
 
-#: src/keyring.c:894
-msgid "/Keys/_Edit Private Key..."
-msgstr "/Schlüssel/G_eheimen Schlüssel Bearbeiten..."
+#: src/keyring.c:909
+msgid "_Delete keys"
+msgstr "SchlÃ¼ssel _lÃ¶schen"
 
-#: src/keyring.c:895
-msgid "/Keys/sep2"
-msgstr "/Schlüssel/sep2"
+#: src/keyring.c:910
+msgid "Remove the selected key"
+msgstr "GewÃ¤hlten SchlÃ¼ssel entfernen"
 
-#: src/keyring.c:896
-msgid "/Keys/_Import Keys..."
-msgstr "/Schlüssel/_Importieren..."
+#: src/keyring.c:911
+msgid "_Sign Keys..."
+msgstr "SchlÃ¼ssel _Signieren..."
 
-#: src/keyring.c:897
-msgid "/Keys/E_xport Keys..."
-msgstr "/Schlüssel/E_xportieren..."
+#: src/keyring.c:912
+msgid "Sign the selected key"
+msgstr "GewÃ¤hlten SchlÃ¼ssel signieren"
 
-#: src/keyring.c:898
-msgid "/Keys/_Backup..."
-msgstr "/Schlüssel/Sicherheitskopie _anlegen..."
+#: src/keyring.c:913
+msgid "Set _Owner Trust..."
+msgstr "SchlÃ¼ssel-_Vertrauen einstellen..."
 
-#: src/keyring.c:901
-msgid "/_Server"
-msgstr "/_Server"
+#: src/keyring.c:914
+msgid "Set owner trust of the selected key"
+msgstr "Vertrauen des gewÃ¤hlten SchlÃ¼ssels einstellen"
 
-#: src/keyring.c:902
-msgid "/Server/_Retrieve Keys..."
-msgstr "/Server/_Schlüssel erhalten..."
+#: src/keyring.c:916
+msgid "_Edit Private Key..."
+msgstr "G_eheimen SchlÃ¼ssel bearbeiten..."
 
-#: src/keyring.c:903
-msgid "/Server/_Send Keys..."
-msgstr "/Server/_Schlüssel verschicken..."
+#: src/keyring.c:917
+msgid "Edit the selected private key"
+msgstr "AusgewÃ¤hlten geheimen SchlÃ¼ssel bearbeiten"
 
-#: src/keyring.c:908
-msgid "/Windows/_File Manager"
-msgstr "/Fenster/_Dateiverwaltung"
+#: src/keyring.c:919
+msgid "_Import Keys..."
+msgstr "SchlÃ¼ssel importieren..."
 
-#: src/keyring.c:939
-msgid "/Keys/Export Keys..."
-msgstr "/Schlüssel/Exportieren..."
+#: src/keyring.c:920
+msgid "Import Keys"
+msgstr "SchlÃ¼ssel importieren"
 
-#: src/keyring.c:944
-msgid "/Keys/Delete Keys..."
-msgstr "/Schlüssel/Löschen..."
+#: src/keyring.c:921
+msgid "E_xport Keys..."
+msgstr "SchlÃ¼ssel e_xportieren..."
 
-#: src/keyring.c:952
-msgid "/Server/Send Keys..."
-msgstr "/Server/Schlüssel verschicken..."
+#: src/keyring.c:922
+msgid "Export Keys"
+msgstr "SchlÃ¼ssel exportieren"
 
-#: src/keyring.c:959
-msgid "/Keys/Set Owner Trust..."
-msgstr "/Schlüssel/Vertrauen einstellen..."
+#: src/keyring.c:923
+msgid "_Backup..."
+msgstr "Sicherheitskopie _anlegen..."
 
-#: src/keyring.c:966
-msgid "/Keys/Sign Keys..."
-msgstr "/Schlüssel/Signieren..."
+#: src/keyring.c:924
+msgid "Backup key"
+msgstr "Sicherheitskopie des SchlÃ¼ssels"
 
-#: src/keyring.c:972
-msgid "/Keys/Edit Private Key..."
-msgstr "/Schlüssel/Geheimen Schlüssel Bearbeiten..."
+#: src/keyring.c:927
+msgid "_Retrieve Keys..."
+msgstr "_SchlÃ¼ssel erhalten..."
 
-#: src/keyring.c:977
-msgid "/Keys/Backup..."
-msgstr "/Schlüssel/Sicherheitskopie _anlegen..."
+#: src/keyring.c:928
+msgid "Retrieve keys from server"
+msgstr "SchlÃ¼ssel _zum Key-Server senden"
 
-#: src/keyring.c:994
-msgid "/_Copy"
-msgstr "_Kopieren"
+#: src/keyring.c:930
+msgid "_Send Keys..."
+msgstr "SchlÃ¼ssel _Senden..."
 
-#: src/keyring.c:996
-msgid "/_Paste"
-msgstr "/Ein_fügen"
+#: src/keyring.c:931
+msgid "Send keys to server"
+msgstr "SchlÃ¼ssel _zum Server senden ..."
 
-#: src/keyring.c:998
-msgid "/_Delete Keys..."
-msgstr "/Schlüssel _Löschen..."
+#: src/keyring.c:937
+msgid "Show Brief Keylist"
+msgstr "SchlÃ¼ssel nur mit Benutzerkennung anzeigen"
 
-#: src/keyring.c:1001
-msgid "/_Sign Keys..."
-msgstr "Schlüssel _Signieren..."
+#: src/keyring.c:939
+msgid "Show Key Details"
+msgstr "SchlÃ¼ssel mit Verfallsdatum und Vertrauenswerten anzeigen"
 
-#: src/keyring.c:1002
-msgid "/Set _Owner Trust..."
-msgstr "/Schlüssel-_Vertrauen einstellen..."
+#: src/keyring.c:1063
+msgid "Edit"
+msgstr "Ã„ndern"
 
-#: src/keyring.c:1003
-msgid "/_Edit Private Key..."
-msgstr "/G_eheimen Schlüssel bearbeiten..."
+#: src/keyring.c:1065
+msgid "Delete"
+msgstr "LÃ¶schen"
 
-#: src/keyring.c:1005
-msgid "/E_xport Keys..."
-msgstr "/Schlüssel e_xportieren..."
+#: src/keyring.c:1067
+msgid "Sign"
+msgstr "Signieren"
 
-#: src/keyring.c:1006
-msgid "/Se_nd Keys to Server..."
-msgstr "/Schlüssel _zum Server senden ..."
+#: src/keyring.c:1069
+msgid "Export"
+msgstr "Export"
 
-#: src/keyring.c:1007
-msgid "/_Backup..."
-msgstr "/Sicherheitskopie _anlegen..."
+#: src/keyring.c:1071
+msgid "Import"
+msgstr "Import"
 
-#: src/keyring.c:1018
-msgid "/Set Owner Trust..."
-msgstr "/Vertrauenswürdigkeit des Eigentümers einstellen..."
-
-#: src/keyring.c:1025
-msgid "/Sign Keys..."
-msgstr "/Schlüssel signieren..."
-
-#: src/keyring.c:1031
-msgid "/Edit Private Key..."
-msgstr "/Geheimen Schlüssel bearbeiten..."
-
-#: src/keyring.c:1036
-msgid "/Backup..."
-msgstr "/Sicherheitskopie _anlegen..."
-
-#: src/keyring.c:1106
+#: src/keyring.c:1178
 msgid "Subkeys"
-msgstr "Untergeordnete Schlüssel"
+msgstr "Untergeordnete SchlÃ¼ssel"
 
-#: src/keyring.c:1180 src/keysigndlg.c:110
+#: src/keyring.c:1252 src/keysigndlg.c:106
 msgid "Fingerprint:"
 msgstr "Fingerabdruck:"
 
-#: src/keyring.c:1182
+#: src/keyring.c:1254
 msgid "Expires at:"
-msgstr "ungültig ab:"
+msgstr "ungÃ¼ltig ab:"
 
-#: src/keyring.c:1184
+#: src/keyring.c:1256
 msgid "Owner Trust:"
 msgstr "Benutzervertrauen:"
 
-#: src/keyring.c:1186
+#: src/keyring.c:1258
 msgid "Key Validity:"
-msgstr "Gültigkeit:"
+msgstr "GÃ¼ltigkeit:"
 
-#: src/keyring.c:1188
+#: src/keyring.c:1260
 msgid "Key Type:"
 msgstr "Art:"
 
-#: src/keyring.c:1190
+#: src/keyring.c:1262
 msgid "Created at:"
 msgstr "erzeugt am:"
 
-#: src/keyring.c:1193
+#: src/keyring.c:1265
 msgid "Details"
 msgstr "Details"
 
-#: src/keyring.c:1201
+#: src/keyring.c:1273
 msgid "Show signatures on user name:"
 msgstr ""
-"Signaturen für die einzelnen im Schlüssel enthaltenen Benutzernamen anzeigen:"
+"Signaturen fÃ¼r die einzelnen im SchlÃ¼ssel enthaltenen Benutzernamen anzeigen:"
 
-#: src/keyring.c:1225
+#: src/keyring.c:1298
 msgid "Signatures"
 msgstr "Signaturen"
 
-#: src/keyring.c:1249
+#: src/keyring.c:1322
 msgid "The key has both a private and a public part"
-msgstr "Dieser Schlüssel hat einen öffentlichen und einen geheimen Teil"
+msgstr "Dieser SchlÃ¼ssel hat einen Ã¶ffentlichen und einen geheimen Teil"
 
-#: src/keyring.c:1252
+#: src/keyring.c:1325
 msgid "The key has only a public part"
-msgstr "Dieser Schlüssel hat nur einen öffentlichen Teil"
+msgstr "Dieser SchlÃ¼ssel hat nur einen Ã¶ffentlichen Teil"
 
-#: src/keyring.c:1287
+#: src/keyring.c:1360
 #, c-format
 msgid "%s %u bits"
 msgstr "%s %u bit"
 
-#: src/keyring.c:1312
+#: src/keyring.c:1385
 msgid "No keys selected"
-msgstr "Keine Schlüssel ausgewählt"
+msgstr "Keine SchlÃ¼ssel ausgewÃ¤hlt"
 
-#: src/keyring.c:1315
+#: src/keyring.c:1388
 #, c-format
 msgid "%d key selected"
 msgid_plural "%d keys selected"
-msgstr[0] "%d Schlüssel ausgewählt"
-msgstr[1] "%d Schlüssel ausgewählt"
+msgstr[0] "%d SchlÃ¼ssel ausgewÃ¤hlt"
+msgstr[1] "%d SchlÃ¼ssel ausgewÃ¤hlt"
 
-#: src/keyring.c:1347
+#: src/keyring.c:1423
 msgid "All signatures"
 msgstr "Alle Signaturen"
 
-#: src/keyring.c:1552
-msgid "Edit"
-msgstr "Ändern"
-
-#: src/keyring.c:1553
-msgid "Edit the selected private key"
-msgstr "Ausgewählten geheimen Schlüssel bearbeiten"
-
-#: src/keyring.c:1554
-msgid "edit key"
-msgstr "Schlüssel bearbeiten"
-
-#: src/keyring.c:1562
-msgid "Remove the selected key"
-msgstr "Gewählten Schlüssel entfernen"
-
-#: src/keyring.c:1563
-msgid "remove key"
-msgstr "Schlüssel entfernen"
-
-#: src/keyring.c:1571
-msgid "Sign the selected key"
-msgstr "Gewählten Schlüssel signieren"
-
-#: src/keyring.c:1571
-msgid "sign key"
-msgstr "Schlüssel signieren"
-
 #: src/keyring.c:1578
-msgid "Import"
-msgstr "Import"
-
-#: src/keyring.c:1579
-msgid "Import Keys"
-msgstr "Schlüssel importieren"
-
-#: src/keyring.c:1579
-msgid "import keys"
-msgstr "Schlüssel importieren"
-
-#: src/keyring.c:1584
-msgid "Export"
-msgstr "Export"
-
-#: src/keyring.c:1585
-msgid "Export Keys"
-msgstr "Schlüssel exportieren"
-
-#: src/keyring.c:1585
-msgid "export keys"
-msgstr "Schlüssel exportieren"
-
-#: src/keyring.c:1598
-msgid "Brief"
-msgstr "Übersicht"
-
-#: src/keyring.c:1598
-msgid "Show Brief Keylist"
-msgstr "Schlüssel nur mit Benutzerkennung anzeigen"
-
-#: src/keyring.c:1599
-msgid "brief"
-msgstr "Übersicht"
-
-#: src/keyring.c:1610
-msgid "Detailed"
-msgstr "Details"
-
-#: src/keyring.c:1610
-msgid "Show Key Details"
-msgstr "Schlüssel mit Verfallsdatum und Vertrauenswerten anzeigen"
-
-#: src/keyring.c:1611
-msgid "detailed"
-msgstr "detailliert"
-
-#: src/keyring.c:1639
-msgid "Refresh the keyring"
-msgstr "Schlüsselbund auffrischen"
-
-#: src/keyring.c:1640
-msgid "refresh keyring"
-msgstr "Schlüsselbund auffrischen"
-
-#: src/keyring.c:1711
 msgid "Selected default key:"
-msgstr "Standard-Schlüssel:"
+msgstr "Standard-SchlÃ¼ssel:"
 
-#: src/keyring.c:1721
+#: src/keyring.c:1588
 msgid "No default key selected in the preferences."
-msgstr "Kein Standard-Schlüssel in den Einstellungen ausgewählt."
+msgstr "Kein Standard-SchlÃ¼ssel in den Einstellungen ausgewÃ¤hlt."
 
-#: src/keyring.c:1833
+#: src/keyring.c:1701
 msgid "GNU Privacy Assistant - Keyring Editor"
-msgstr "GNU Privacy Assistant - Schlüsselverwaltung"
+msgstr "GNU Privacy Assistant - SchlÃ¼sselverwaltung"
 
-#: src/keyring.c:1865
+#: src/keyring.c:1728
 msgid "Keyring Editor"
-msgstr "Schlüsselverwaltung"
+msgstr "SchlÃ¼sselverwaltung"
 
-#: src/keysigndlg.c:60
+#: src/keysigndlg.c:59
 msgid "Sign Key"
-msgstr "Schlüssel signieren"
+msgstr "SchlÃ¼ssel signieren"
 
-#: src/keysigndlg.c:76
+#: src/keysigndlg.c:72
 msgid "Do you want to sign the following key?"
-msgstr "Wollen Sie den folgenden Schlüssel signieren?"
+msgstr "Wollen Sie den folgenden SchlÃ¼ssel signieren?"
 
-#: src/keysigndlg.c:120
+#: src/keysigndlg.c:116
 msgid ""
 "Check the name and fingerprint carefully to be sure that it really is the "
 "key you want to sign."
 msgstr ""
-"Überprüfen Sie sorgfältig den Namen und den Fingerabdruck, damit Sie sicher "
-"sind, daß dies der Schlüssel ist, den Sie signieren wollen."
+"ÃœberprÃ¼fen Sie sorgfÃ¤ltig den Namen und den Fingerabdruck, damit Sie sicher "
+"sind, daÃŸ dies der SchlÃ¼ssel ist, den Sie signieren wollen."
 
-#: src/keysigndlg.c:128
+#: src/keysigndlg.c:124
 msgid "All user names in this key will be signed."
-msgstr "Alle Benutzernamen dieses Schlüssels werden signiert."
+msgstr "Alle Benutzernamen dieses SchlÃ¼ssels werden signiert."
 
-#: src/keysigndlg.c:134
+#: src/keysigndlg.c:130
 msgid "The key will be signed with your default private key."
-msgstr "Der Schlüssel wird mit Ihrem Standard-Schlüssel signiert."
+msgstr "Der SchlÃ¼ssel wird mit Ihrem Standard-SchlÃ¼ssel signiert."
 
-#: src/keysigndlg.c:141
+#: src/keysigndlg.c:137
 msgid "Sign only _locally"
 msgstr "Nur _lokal signieren"
 
-#: src/options.c:316
+#: src/options.c:323
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
 msgstr ""
-"Der persönliche Schlüssel, den Sie als Standard ausgewählt haben,\n"
-"ist nicht mehr verfügbar.\n"
-"GPA wird versuchen, automatisch einen neuen Standardschlüssel auszuwählen."
+"Der persÃ¶nliche SchlÃ¼ssel, den Sie als Standard ausgewÃ¤hlt haben,\n"
+"ist nicht mehr verfÃ¼gbar.\n"
+"GPA wird versuchen, automatisch einen neuen StandardschlÃ¼ssel auszuwÃ¤hlen."
 
-#: src/ownertrustdlg.c:106
+#: src/ownertrustdlg.c:107
 msgid "Change key ownertrust"
-msgstr "Benutzervertrauen ändern"
+msgstr "Benutzervertrauen Ã¤ndern"
 
-#: src/ownertrustdlg.c:130
+#: src/ownertrustdlg.c:131
 msgid "_Unknown"
 msgstr "_unbekannt"
 
-#: src/ownertrustdlg.c:135
+#: src/ownertrustdlg.c:136
 msgid ""
 "You don't know how much to trust this user to verify other people's keys.\n"
 msgstr ""
-"Sie wissen nicht, in wie weit Sie diesem Benutzer vertrauen können, die "
-"Schlüssel Dritter zu beglaubigen.\n"
+"Sie wissen nicht, in wie weit Sie diesem Benutzer vertrauen kÃ¶nnen, die "
+"SchlÃ¼ssel Dritter zu beglaubigen.\n"
 
-#: src/ownertrustdlg.c:145
+#: src/ownertrustdlg.c:146
 msgid "_Never"
 msgstr "_Niemals"
 
-#: src/ownertrustdlg.c:150
+#: src/ownertrustdlg.c:151
 msgid ""
 "You don't trust this user at all to verify the validity of other people's "
 "keys at all.\n"
 msgstr ""
-"Sie haben keinerlei Vertrauen in die Beglaubigung von Schlüsseln Dritter "
+"Sie haben keinerlei Vertrauen in die Beglaubigung von SchlÃ¼sseln Dritter "
 "durch diesen Benutzer.\n"
 
-#: src/ownertrustdlg.c:160
+#: src/ownertrustdlg.c:161
 msgid "_Marginal"
 msgstr "_kaum"
 
-#: src/ownertrustdlg.c:165
+#: src/ownertrustdlg.c:166
 msgid ""
 "You don't trust this user's ability to verify the validity of other people's "
 "keys enough to consider keys valid based on his/her sole word.\n"
@@ -1925,33 +1572,33 @@
 "by this user valid if it is also signed by at least other two marginally "
 "trusted users with valid keys\n"
 msgstr ""
-"Sie vertrauen der Beglaubigung von Schlüsseln Dritter durch diesen Benutzer "
-"nicht genug,  um Schlüssel allein auf sein/ihr Wort hin für gültig zu "
+"Sie vertrauen der Beglaubigung von SchlÃ¼sseln Dritter durch diesen Benutzer "
+"nicht genug,  um SchlÃ¼ssel allein auf sein/ihr Wort hin fÃ¼r gÃ¼ltig zu "
 "erachten.\n"
-"Sollte allerdings ein Schlüssel von diesem und mindestens zwei weiteren "
-"\"kaum\" vertrauenswürdigen Benutzern gültig signiert sein (gültige "
-"Schlüssel jeweils vorausgesetzt), so werden sie auch den so signierten "
-"Schlüssel für gültig erachten.\n"
+"Sollte allerdings ein SchlÃ¼ssel von diesem und mindestens zwei weiteren "
+"\"kaum\" vertrauenswÃ¼rdigen Benutzern gÃ¼ltig signiert sein (gÃ¼ltige "
+"SchlÃ¼ssel jeweils vorausgesetzt), so werden sie auch den so signierten "
+"SchlÃ¼ssel fÃ¼r gÃ¼ltig erachten.\n"
 
-#: src/ownertrustdlg.c:182
+#: src/ownertrustdlg.c:183
 msgid "_Full"
-msgstr "_Vollständig"
+msgstr "_VollstÃ¤ndig"
 
-#: src/ownertrustdlg.c:187
+#: src/ownertrustdlg.c:188
 msgid ""
 "You trust this user's ability to verify the validity of other people's keys "
 "so much, that you'll consider valid any key signed by him/her, provided this "
 "user's key is valid.\n"
 msgstr ""
-"Sie vertrauen der Beglaubigung von Schlüsseln durch diesen Benutzer so sehr, "
-"dass Sie jeden von ihm/ihr beglaubigten Schlüssel für gültig erachten "
-"(Gültigkeit seines/ihres Schlüssels vorausgesetzt).\n"
+"Sie vertrauen der Beglaubigung von SchlÃ¼sseln durch diesen Benutzer so sehr, "
+"dass Sie jeden von ihm/ihr beglaubigten SchlÃ¼ssel fÃ¼r gÃ¼ltig erachten "
+"(GÃ¼ltigkeit seines/ihres SchlÃ¼ssels vorausgesetzt).\n"
 
-#: src/ownertrustdlg.c:200
+#: src/ownertrustdlg.c:201
 msgid "U_ltimate"
 msgstr "Absolut"
 
-#: src/ownertrustdlg.c:205
+#: src/ownertrustdlg.c:206
 msgid ""
 "You consider this key valid, and trust the user so much that you will "
 "consider any key signed by him/her fully valid.\n"
@@ -1959,12 +1606,12 @@
 "(Warning: This is intended to be used for keys you own. Don't use it with "
 "other people's keys unless you really know what you are doing)\n"
 msgstr ""
-"Sie halten diesen Schlüssel für gültig und vertrauen seinem Eigentümer so "
-"weit gehend, dass sie jeden von ihm/ihr beglaubigten Schlüssel für gültig "
+"Sie halten diesen SchlÃ¼ssel fÃ¼r gÃ¼ltig und vertrauen seinem EigentÃ¼mer so "
+"weit gehend, dass sie jeden von ihm/ihr beglaubigten SchlÃ¼ssel fÃ¼r gÃ¼ltig "
 "erachten.\n"
 "\n"
-"(Warnung: Diese Einstellung ist ausschließlich für Ihre eigenen Schlüssel "
-"vorgesehen. Benutzen Sie sie nicht für Schlüssel anderen Personen - außer, "
+"(Warnung: Diese Einstellung ist ausschlieÃŸlich fÃ¼r Ihre eigenen SchlÃ¼ssel "
+"vorgesehen. Benutzen Sie sie nicht fÃ¼r SchlÃ¼ssel anderen Personen - auÃŸer, "
 "Sie wissen genau, was Sie damit tun.)\n"
 
 #: src/passwddlg.c:96
@@ -1982,7 +1629,7 @@
 
 #: src/server_access.c:288
 msgid "Operation not supported"
-msgstr "Diese Operation wird nicht unterstützt"
+msgstr "Diese Operation wird nicht unterstÃ¼tzt"
 
 #: src/server_access.c:291
 msgid "Version mismatch"
@@ -1990,27 +1637,27 @@
 
 #: src/server_access.c:294
 msgid "Internal keyserver error"
-msgstr "Interner Fehler des Schlüssel-Servers"
+msgstr "Interner Fehler des SchlÃ¼ssel-Servers"
 
 #: src/server_access.c:297
 msgid "Out of memory"
-msgstr "Nicht genügend Speicherplatz."
+msgstr "Nicht genÃ¼gend Speicherplatz."
 
 #: src/server_access.c:300
 msgid "Key not found"
-msgstr "Der Schlüssel wurde nicht gefunden."
+msgstr "Der SchlÃ¼ssel wurde nicht gefunden."
 
 #: src/server_access.c:303
 msgid "Key already exists on server"
-msgstr "Der Schlüssel liegt auf dem Server bereits vor."
+msgstr "Der SchlÃ¼ssel liegt auf dem Server bereits vor."
 
 #: src/server_access.c:306
 msgid "Key incomplete"
-msgstr "Unvollständiger Schlüssel"
+msgstr "UnvollstÃ¤ndiger SchlÃ¼ssel"
 
 #: src/server_access.c:309
 msgid "Could not contact keyserver"
-msgstr "Keinve Verbindung zum Schlüssel-Server möglich."
+msgstr "Keinve Verbindung zum SchlÃ¼ssel-Server mÃ¶glich."
 
 #: src/server_access.c:312
 msgid "Unknown Error"
@@ -2041,53 +1688,176 @@
 "There is no plugin available for the keyserver\n"
 "protocol you specified."
 msgstr ""
-"Für das eingestellte Schlüssel-Server-Protokoll\n"
-"ist kein Plugin verfügbar."
+"FÃ¼r das eingestellte SchlÃ¼ssel-Server-Protokoll\n"
+"ist kein Plugin verfÃ¼gbar."
 
-#: src/server_access.c:528 src/server_access.c:574
+#: src/server_access.c:528 src/server_access.c:572
 msgid "The keyserver you specified is not valid"
-msgstr "Der angegebene Schlüssel-Server ist nicht gültig."
+msgstr "Der angegebene SchlÃ¼ssel-Server ist nicht gÃ¼ltig."
 
-#: src/settingsdlg.c:59
+#: src/settingsdlg.c:133 src/siglist.c:135
+msgid "Local"
+msgstr "Lokal"
+
+#: src/settingsdlg.c:134
+msgid "Local, Keyserver"
+msgstr "Lokal, SchlÃ¼ssel-Server"
+
+#: src/settingsdlg.c:135
+msgid "Local, PKA"
+msgstr "Lokal, PKA"
+
+#: src/settingsdlg.c:136
+msgid "Local, PKA, Keyserver"
+msgstr "Lokal, PKA, SchlÃ¼ssel-Server"
+
+#: src/settingsdlg.c:137
+msgid "Local, Keyserver, PKA"
+msgstr "Lokal, SchlÃ¼ssel-Server, PKA"
+
+#: src/settingsdlg.c:138
+msgid "Local, kDNS"
+msgstr "Lokal, kDNS"
+
+#: src/settingsdlg.c:139
+msgid "Local, kDNS, Keyserver"
+msgstr "Lokal, kDNS, SchlÃ¼ssel-Server"
+
+#: src/settingsdlg.c:140
+msgid "PKA"
+msgstr "PKA"
+
+#: src/settingsdlg.c:141
+msgid "kDNS"
+msgstr "kDNS"
+
+#: src/settingsdlg.c:142
+msgid "Custom"
+msgstr "Spezialkonfiguration"
+
+#: src/settingsdlg.c:208
+msgid "<b>User interface</b>"
+msgstr "<b>Benutzerschnittstelle<b>"
+
+#: src/settingsdlg.c:215
+msgid "Use _advanced mode"
+msgstr "<b>Einstellungen fÃ¼r _Fortgeschrittene verwenden<b>"
+
+#: src/settingsdlg.c:221
+msgid "Show advanced _options"
+msgstr "Erweiterte EinstellmÃ¶glichkeiten anzeigen"
+
+#: src/settingsdlg.c:272
+msgid ""
+"No default key has been selected.  This may lead to problems when signing or "
+"encrypting.  For example you might later not be able to read a mail written "
+"by you and encrypted to someone else.\n"
+"\n"
+"Please consider creating your own key and select it then."
+msgstr ""
+"Es wurde kein StandardschlÃ¼ssel ausgewÃ¤hlt.  Dies kann beim Signieren und "
+"VerschlÃ¼sseln zu Problemen fÃ¼hren.  Es kann zum Beispiel sein, daÃŸ Sie nicht "
+"mehr in der Lage sein werden, eine von Ihnen geschriebene und an einen "
+"Dritten verschlÃ¼sselte Nachricht, spÃ¤ter selber zu lesen.\n"
+"\n"
+"Bitte erwÃ¤gen Sie, einen eigenen SchlÃ¼ssel zu erzeugen und auszuwÃ¤hlen."
+
+#: src/settingsdlg.c:278
+msgid "Continue without a default key"
+msgstr "Ohne StandardschlÃ¼ssel weitermachen"
+
+#: src/settingsdlg.c:280
+msgid "Let me select a default key"
+msgstr "Ich mÃ¶chte einen Standard-SchlÃ¼ssel auswÃ¤hlen"
+
+#: src/settingsdlg.c:305
 msgid "<b>Default _key</b>"
-msgstr "<b>_Standard-Schlüssel</b>"
+msgstr "<b>_Standard-SchlÃ¼ssel</b>"
 
-#: src/settingsdlg.c:111
+#: src/settingsdlg.c:405
 msgid "<b>Default key_server</b>"
-msgstr "<b>Standard-Schlüssel-Ser_ver</b>"
+msgstr "<b>Standard-SchlÃ¼ssel-Ser_ver</b>"
 
-#: src/settingsdlg.c:158
-msgid "<b>Use _advanced mode</b>"
-msgstr "<b>Einstellungen für _Fortgeschrittene verwenden<b>"
+#: src/settingsdlg.c:602
+msgid "<b>Auto key _locate</b>"
+msgstr "<b>Automatisches Auffinden von SchlÃ¼sseln</b>"
 
-#: src/settingsdlg.c:193
-msgid "Settings"
-msgstr "Einstellungen"
+#: src/settingsdlg.c:612
+msgid ""
+"The list of methods to locate keys via an email address.\n"
+"All given methods are used in turn until a matching key is found.  The "
+"supported methods are:\n"
+" Local\n"
+"   - Use the local keyring.\n"
+" Keyserver\n"
+"   - Use the default keyserver.\n"
+" PKA\n"
+"   - Use the Public Key Association.\n"
+" kDNS\n"
+"   - Use kDNS with the nameserver below.\n"
+" Custom\n"
+"   - Configured in the backend dialog.\n"
+msgstr ""
+"Diese Liste bestimmt, mit welchen Methoden SchlÃ¼ssel automatisch aufgefunden "
+"werden.  Alle Methoden werden der Reihe nach benutzt bis ein SchlÃ¼ssel "
+"gefunden wurde.  UnterstÃ¼tzte Methoden sind:\n"
+"\n"
+" Lokal\n"
+"   - Ãœber den lokale SchlÃ¼sselring.\n"
+" SchlÃ¼ssel-Server\n"
+"   - Ãœber de Standard SchlÃ¼ssel-Server.\n"
+" PKA\n"
+"   - Ãœber das \"Public Key Association\" Verfahren\n"
+" kDNS\n"
+"   - Ãœber das \"kDNS\" Verfahren auf dem unten angegebenen Server.\n"
+" Spezialkonfiguration\n"
+"   - Nur mit den Einstellungen zum Krypto Backend zu konfigurieren.\n"
 
+#: src/settingsdlg.c:627
+msgid "Method:"
+msgstr "Methode:"
+
+#: src/settingsdlg.c:644
+msgid "The IP address of the nameserver used for the kDNS method."
+msgstr "Die IP Adresse des fÃ¼r die kDNS Methode zu verwendenden Servers."
+
+#: src/settingsdlg.c:646
+msgid "kDNS Server:"
+msgstr "kDNS Server"
+
+#: src/settingsdlg.c:740
+msgid "The URL given for the keyserver is not valid."
+msgstr "Der angegebene SchlÃ¼ssel-Server ist nicht gÃ¼ltig."
+
+#: src/settingsdlg.c:749
+msgid "The data given for \"Auto key locate\" is not valid."
+msgstr ""
+"Die Angaben fÃ¼r \"Automatisches Auffinden von SchlÃ¼sseln\" sind nicht gÃ¼ltig."
+
+#: src/settingsdlg.c:886
+msgid "GNU Privacy Assistant - Settings"
+msgstr "GNU Privacy Assistant - Einstellungen"
+
 #: src/siglist.c:128
 msgid "Level"
 msgstr "Stufe"
 
-#: src/siglist.c:135
-msgid "Local"
-msgstr "Lokal"
-
 #: src/verifydlg.c:116
 msgid "Verify documents"
-msgstr "Dokumente prüfen"
+msgstr "Dokumente prÃ¼fen"
 
 #: src/verifydlg.c:232
 msgid "Expired Key"
-msgstr "Abgelaufene Schlüssel"
+msgstr "Abgelaufene SchlÃ¼ssel"
 
 #: src/verifydlg.c:240
 msgid "Key NOT valid"
-msgstr "Schlüssel ist NICHT gültig!"
+msgstr "SchlÃ¼ssel ist NICHT gÃ¼ltig!"
 
 #: src/verifydlg.c:359
 #, c-format
 msgid "Verified data in file: %s"
-msgstr "Überprüfte Daten in Datei: %s"
+msgstr "ÃœberprÃ¼fte Daten in Datei: %s"
 
 #: src/verifydlg.c:364
 #, c-format
@@ -2098,8 +1868,353 @@
 msgid "Signatures:"
 msgstr "Signaturen (Beglaubigungen)"
 
+#~ msgid "/File/C_lear"
+#~ msgstr "/Datei/_Leeren"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Datei/_Ã–ffnen"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Datei/Speichern unter"
+
+#~ msgid "/File/sep1"
+#~ msgstr "/Datei/sep1"
+
+#~ msgid "/File/_Sign"
+#~ msgstr "/Datei/_Signieren"
+
+#~ msgid "/File/_Verify"
+#~ msgstr "/Datei/Ãœber_prÃ¼fen"
+
+#~ msgid "/File/_Encrypt"
+#~ msgstr "/Datei/_VerschlÃ¼sseln"
+
+#~ msgid "/File/_Decrypt"
+#~ msgstr "/Datei/_EntschlÃ¼sseln"
+
+#~ msgid "/File/sep2"
+#~ msgstr "/Datei/sep2"
+
+#~ msgid "/File/_Close"
+#~ msgstr "/Datei/_Fenster schlieÃŸen"
+
+#~ msgid "/File/_Quit"
+#~ msgstr "/Datei/_Beenden"
+
+#~ msgid "/Edit/_Undo"
+#~ msgstr "/Bearbeiten/ZurÃ¼cknehmen"
+
+#~ msgid "/Edit/_Redo"
+#~ msgstr "/Bearbeiten/Wiederholen"
+
+#~ msgid "/Edit/sep0"
+#~ msgstr "/Bearbeiten/sep0"
+
+#~ msgid "/Edit/Cut"
+#~ msgstr "/Bearbeiten/Ausschneiden"
+
+#~ msgid "/Edit/_Copy"
+#~ msgstr "/Bearbeiten/_Kopieren"
+
+#~ msgid "/Edit/_Paste"
+#~ msgstr "/Bearbeiten/Ein_fÃ¼gen"
+
+#~ msgid "/Edit/_Delete"
+#~ msgstr "/Bearbeiten/LÃ¶schen"
+
+#~ msgid "/Edit/sep1"
+#~ msgstr "/Bearbeiten/sep1"
+
+#~ msgid "/Edit/Select _All"
+#~ msgstr "/Bearbeiten/Alle A_uswÃ¤hlen"
+
+#~ msgid "/Edit/sep2"
+#~ msgstr "/Bearbeiten/sep2"
+
+#~ msgid "/Edit/Pr_eferences..."
+#~ msgstr "/Bearbeiten/_Einstellungen"
+
+#~ msgid "/Edit/_Backend Preferences..."
+#~ msgstr "/Bearbeiten/Backend _Einstellungen"
+
+#~ msgid "/_Windows"
+#~ msgstr "/_Fenster"
+
+#~ msgid "/Windows/_Keyring Editor"
+#~ msgstr "/Fenster/_SchlÃ¼sselverwaltung"
+
+#~ msgid "/Windows/_Filemanager"
+#~ msgstr "/Fenster/_Dateiverwaltung"
+
+#~ msgid "/Windows/_Clipboard"
+#~ msgstr "/Fenster/_Zwischenablage"
+
+#~ msgid "/Edit/Copy"
+#~ msgstr "/Bearbeiten/Kopieren"
+
+#~ msgid "/Edit/Delete"
+#~ msgstr "/Bearbeiten/LÃ¶schen"
+
+#~ msgid "/Edit/Paste"
+#~ msgstr "/Bearbeiten/Ein_fÃ¼gen"
+
+#~ msgid "clear buffer"
+#~ msgstr "Textfeld lÃ¶schen"
+
+#~ msgid "open file"
+#~ msgstr "Datei Ã¶ffnen"
+
+#~ msgid "save file as"
+#~ msgstr "Datei _speichern unter"
+
+#~ msgid "cut the selection"
+#~ msgstr "Auswahl ausschneiden"
+
+#~ msgid "copy the selection"
+#~ msgstr "Auswahl kopieren"
+
+#~ msgid "paste the clipboard"
+#~ msgstr "Zwischenablage einfÃ¼gen"
+
+#~ msgid "Sign the selected text"
+#~ msgstr "GewÃ¤hlten Text signieren"
+
+#~ msgid "verify text"
+#~ msgstr "Text prÃ¼fen"
+
+#~ msgid "Encrypt"
+#~ msgstr "VerschlÃ¼sseln"
+
+#~ msgid "encrypt text"
+#~ msgstr "Text verschlÃ¼sseln"
+
+#~ msgid "decrypt text"
+#~ msgstr "Text entschlÃ¼sseln"
+
+#~ msgid "preferences"
+#~ msgstr "Einstellungen"
+
+#~ msgid "Open the keyring editor"
+#~ msgstr "SchlÃ¼sselverwaltung Ã¶ffnen"
+
+#~ msgid "keyring editor"
+#~ msgstr "SchlÃ¼sselverwaltung"
+
+#~ msgid "Open the file manager"
+#~ msgstr "Dateiverwaltung aufrufen"
+
+#~ msgid "file manager"
+#~ msgstr "Dateiverwaltung"
+
+#~ msgid "Help"
+#~ msgstr "Hilfe"
+
+#~ msgid "help"
+#~ msgstr "Hilfe"
+
+#~ msgid "/File/Sign"
+#~ msgstr "/Datei/_Signieren"
+
+#~ msgid "/File/Verify"
+#~ msgstr "/Datei/Ãœber_prÃ¼fen"
+
+#~ msgid "/File/Encrypt"
+#~ msgstr "/Datei/_VerschlÃ¼sseln"
+
+#~ msgid "/File/Decrypt"
+#~ msgstr "/Datei/_EntschlÃ¼sseln"
+
+#~ msgid "close files"
+#~ msgstr "Dateien schlieÃŸen"
+
+#~ msgid "sign file"
+#~ msgstr "Datei signieren"
+
+#~ msgid "verify file"
+#~ msgstr "Datei prÃ¼fen"
+
+#~ msgid "encrypt file"
+#~ msgstr "Datei verschlÃ¼sseln"
+
+#~ msgid "decrypt file"
+#~ msgstr "Datei entschlÃ¼sseln"
+
+#~ msgid "Open the clipboard"
+#~ msgstr "Zwischenablage Ã¶ffnen"
+
+#~ msgid "clipboard"
+#~ msgstr "Zwischenablage"
+
+#~ msgid "_Backup to file:"
+#~ msgstr "_Sicherheitskopie in Datei:"
+
+#~ msgid "B_rowse..."
+#~ msgstr "_Durchsuchen..."
+
+#~ msgid "_Back"
+#~ msgstr "_ZurÃ¼ck"
+
+#~ msgid "_Forward"
+#~ msgstr "_Weiter"
+
+#~ msgid "_Apply"
+#~ msgstr "_Anwenden"
+
+#~ msgid "Brought to you by:"
+#~ msgstr "ErmÃ¶glicht durch die Arbeit von:"
+
+#~ msgid "GPA is Free Software under the"
+#~ msgstr "GPA ist Freie Software unter der"
+
+#~ msgid "GNU General Public License."
+#~ msgstr "GNU General Public License."
+
+#~ msgid "For news see:"
+#~ msgstr "Aktuelle Informationen finden Sie unter:"
+
+#~ msgid "http://www.gpg4win.org"
+#~ msgstr "http://www.gpg4win.de"
+
+#~ msgid "http://www.gnupg.org"
+#~ msgstr "http://www.gnupg.de"
+
+#~ msgid "GNU General Public License"
+#~ msgstr "GNU General Public License."
+
+#~ msgid "_GNU General Public License"
+#~ msgstr "_GNU General Public License."
+
+#~ msgid "Show Help Text\n"
+#~ msgstr "Hilfe anzeigen\n"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Hilfe"
+
+#~ msgid "/Help/_Contents"
+#~ msgstr "/Hilfe/_Inhalt"
+
+#~ msgid "/Help/_License"
+#~ msgstr "/Hilfe/_Lizenz"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/Hilfe/_Ãœber GPA"
+
+#~ msgid "Please insert your name"
+#~ msgstr "Bitte geben Sie Ihren Namen an."
+
+#~ msgid "Please insert your email address"
+#~ msgstr "Bitte geben Sie Ihre E-Mail-Adresse an"
+
+#~ msgid "/Keys/_Refresh"
+#~ msgstr "/SchlÃ¼ssel/Auf_frischen"
+
+#~ msgid "/Keys/sep0"
+#~ msgstr "/SchlÃ¼ssel/sep0"
+
+#~ msgid "/Keys/_Delete Keys..."
+#~ msgstr "/SchlÃ¼ssel/_LÃ¶schen..."
+
+#~ msgid "/Keys/sep1"
+#~ msgstr "/SchlÃ¼ssel/sep1"
+
+#~ msgid "/Keys/_Sign Keys..."
+#~ msgstr "/SchlÃ¼ssel/_Signieren..."
+
+#~ msgid "/Keys/Set _Owner Trust..."
+#~ msgstr "/SchlÃ¼ssel/_Vertrauen einstellen..."
+
+#~ msgid "/Keys/_Edit Private Key..."
+#~ msgstr "/SchlÃ¼ssel/G_eheimen SchlÃ¼ssel Bearbeiten..."
+
+#~ msgid "/Keys/sep2"
+#~ msgstr "/SchlÃ¼ssel/sep2"
+
+#~ msgid "/Keys/_Import Keys..."
+#~ msgstr "/SchlÃ¼ssel/_Importieren..."
+
+#~ msgid "/Keys/E_xport Keys..."
+#~ msgstr "/SchlÃ¼ssel/E_xportieren..."
+
+#~ msgid "/Keys/_Backup..."
+#~ msgstr "/SchlÃ¼ssel/Sicherheitskopie _anlegen..."
+
+#~ msgid "/Server/_Send Keys..."
+#~ msgstr "/Server/_SchlÃ¼ssel verschicken..."
+
+#~ msgid "/Windows/_File Manager"
+#~ msgstr "/Fenster/_Dateiverwaltung"
+
+#~ msgid "/Keys/Export Keys..."
+#~ msgstr "/SchlÃ¼ssel/Exportieren..."
+
+#~ msgid "/Keys/Delete Keys..."
+#~ msgstr "/SchlÃ¼ssel/LÃ¶schen..."
+
+#~ msgid "/Server/Send Keys..."
+#~ msgstr "/Server/SchlÃ¼ssel verschicken..."
+
+#~ msgid "/Keys/Set Owner Trust..."
+#~ msgstr "/SchlÃ¼ssel/Vertrauen einstellen..."
+
+#~ msgid "/Keys/Sign Keys..."
+#~ msgstr "/SchlÃ¼ssel/Signieren..."
+
+#~ msgid "/Keys/Edit Private Key..."
+#~ msgstr "/SchlÃ¼ssel/Geheimen SchlÃ¼ssel Bearbeiten..."
+
+#~ msgid "/Keys/Backup..."
+#~ msgstr "/SchlÃ¼ssel/Sicherheitskopie _anlegen..."
+
+#~ msgid "/_Copy"
+#~ msgstr "_Kopieren"
+
+#~ msgid "/_Paste"
+#~ msgstr "/Ein_fÃ¼gen"
+
+#~ msgid "/_Delete Keys..."
+#~ msgstr "/SchlÃ¼ssel _LÃ¶schen..."
+
+#~ msgid "/Set Owner Trust..."
+#~ msgstr "/VertrauenswÃ¼rdigkeit des EigentÃ¼mers einstellen..."
+
+#~ msgid "/Sign Keys..."
+#~ msgstr "/SchlÃ¼ssel signieren..."
+
+#~ msgid "/Edit Private Key..."
+#~ msgstr "/Geheimen SchlÃ¼ssel bearbeiten..."
+
+#~ msgid "/Backup..."
+#~ msgstr "/Sicherheitskopie _anlegen..."
+
+#~ msgid "edit key"
+#~ msgstr "SchlÃ¼ssel bearbeiten"
+
+#~ msgid "remove key"
+#~ msgstr "SchlÃ¼ssel entfernen"
+
+#~ msgid "sign key"
+#~ msgstr "SchlÃ¼ssel signieren"
+
+#~ msgid "import keys"
+#~ msgstr "SchlÃ¼ssel importieren"
+
+#~ msgid "export keys"
+#~ msgstr "SchlÃ¼ssel exportieren"
+
+#~ msgid "brief"
+#~ msgstr "Ãœbersicht"
+
+#~ msgid "detailed"
+#~ msgstr "detailliert"
+
+#~ msgid "refresh keyring"
+#~ msgstr "SchlÃ¼sselbund auffrischen"
+
+#~ msgid "Settings"
+#~ msgstr "Einstellungen"
+
 #~ msgid "Key Validity"
-#~ msgstr "Gültigkeit des Schlüssels"
+#~ msgstr "GÃ¼ltigkeit des SchlÃ¼ssels"
 
 #~ msgid "GPA Warning"
 #~ msgstr "GPA Warnung"
@@ -2113,13 +2228,13 @@
 #~ "\n"
 #~ "The affected key is:"
 #~ msgstr ""
-#~ "Einer Ihrer Schlüssel hat einen ElGamal Signaturschlüssel.  Durch\n"
-#~ "einen Fehler in GnuPG sind alle diese Schlüssel - sofern jemals mit\n"
+#~ "Einer Ihrer SchlÃ¼ssel hat einen ElGamal SignaturschlÃ¼ssel.  Durch\n"
+#~ "einen Fehler in GnuPG sind alle diese SchlÃ¼ssel - sofern jemals mit\n"
 #~ "GnuPG ab 1.0.2 verwendet - als kompromitiert zu betrachten.\n"
 #~ "\n"
-#~ "Bitte widerrufen Sie diesen Schlüssel sobald wie möglich.\n"
+#~ "Bitte widerrufen Sie diesen SchlÃ¼ssel sobald wie mÃ¶glich.\n"
 #~ "\n"
-#~ "Der betroffene Schlüssel ist:"
+#~ "Der betroffene SchlÃ¼ssel ist:"
 
 #~ msgid "Sign files"
 #~ msgstr "Dateien signieren"
@@ -2151,10 +2266,10 @@
 #~ "keys for the same email address. The comment is completely optional. "
 #~ "Leave it empty if you don't have a use for it."
 #~ msgstr ""
-#~ "Wenn Sie möchten, können Sie einen Kommentar hinzufügen, der den "
-#~ "Schlüssel genauer beschreibt. Ein Kommentar ist vor allem dann sinnvoll, "
-#~ "wenn Sie mehrere Schlüssel für die gleiche E-Mail-Adresse erstellen. Wenn "
-#~ "Sie keine Verwendung dafür haben, können Sie den Kommentar auch einfach "
+#~ "Wenn Sie mÃ¶chten, kÃ¶nnen Sie einen Kommentar hinzufÃ¼gen, der den "
+#~ "SchlÃ¼ssel genauer beschreibt. Ein Kommentar ist vor allem dann sinnvoll, "
+#~ "wenn Sie mehrere SchlÃ¼ssel fÃ¼r die gleiche E-Mail-Adresse erstellen. Wenn "
+#~ "Sie keine Verwendung dafÃ¼r haben, kÃ¶nnen Sie den Kommentar auch einfach "
 #~ "leer lassen."
 
 #~ msgid "Comment:"
@@ -2166,31 +2281,28 @@
 #~ msgid "Keyserver did not return any matching keys."
 #~ msgstr ""
 #~ "Der Key-Server hat keine passenden\n"
-#~ "Schlüssel zurückgeliefert."
+#~ "SchlÃ¼ssel zurÃ¼ckgeliefert."
 
 #~ msgid "Select keys to import"
-#~ msgstr "Schlüssel zum Importieren auswählen"
+#~ msgstr "SchlÃ¼ssel zum Importieren auswÃ¤hlen"
 
 #~ msgid "_Import"
 #~ msgstr "_Importieren"
 
 #~ msgid "Export Key"
-#~ msgstr "Schlüssel exportieren"
+#~ msgstr "SchlÃ¼ssel exportieren"
 
 #~ msgid "E_xport to file:"
 #~ msgstr "E_xportieren in Datei: "
 
-#~ msgid "_Key server:"
-#~ msgstr "An _Key-Server senden: "
-
 #~ msgid "Import Key"
-#~ msgstr "Schlüssel importieren"
+#~ msgstr "SchlÃ¼ssel importieren"
 
 #~ msgid "I_mport from file:"
 #~ msgstr "_Importieren aus Datei:"
 
 #~ msgid "Receive from _server:"
-#~ msgstr "Schlüssel vom Key-Server _empfangen:"
+#~ msgstr "SchlÃ¼ssel vom Key-Server _empfangen:"
 
 #~ msgid ""
 #~ "You have a secret key without the\n"
@@ -2199,82 +2311,79 @@
 #~ "you will need to import the public\n"
 #~ "key, too."
 #~ msgstr ""
-#~ "Sie haben einen geheimen Schlüssel ohne den\n"
-#~ "zugehörigen öffentlichen Schlüssel in Ihrem\n"
-#~ "Schlüsselbund. Um diesen Schlüssel nutzen zu\n"
-#~ "können, müssen Sie den öffentlichen Schlüssel\n"
+#~ "Sie haben einen geheimen SchlÃ¼ssel ohne den\n"
+#~ "zugehÃ¶rigen Ã¶ffentlichen SchlÃ¼ssel in Ihrem\n"
+#~ "SchlÃ¼sselbund. Um diesen SchlÃ¼ssel nutzen zu\n"
+#~ "kÃ¶nnen, mÃ¼ssen Sie den Ã¶ffentlichen SchlÃ¼ssel\n"
 #~ "ebenfalls importieren."
 
 #~ msgid "No keys selected to export."
-#~ msgstr "Keine Schlüssel zum Exportieren ausgewählt."
+#~ msgstr "Keine SchlÃ¼ssel zum Exportieren ausgewÃ¤hlt."
 
 #~ msgid "No private key to backup."
-#~ msgstr "Kein privater Schlüssel vorhanden."
+#~ msgstr "Kein privater SchlÃ¼ssel vorhanden."
 
 #~ msgid "GPA: Loading keyring"
-#~ msgstr "GPA: Schlüsselbund einlesen"
+#~ msgstr "GPA: SchlÃ¼sselbund einlesen"
 
 #~ msgid "Loading secret keys"
-#~ msgstr "Geheime Schlüssel einlesen"
+#~ msgstr "Geheime SchlÃ¼ssel einlesen"
 
 #~ msgid "Loading public keys"
-#~ msgstr "Öffentliche Schlüssel einlesen"
+#~ msgstr "Ã–ffentliche SchlÃ¼ssel einlesen"
 
 #~ msgid "The key you selected is not available for encryption"
-#~ msgstr "Der ausgewählte Schlüssel ist nicht zum Verschlüsseln verfügbar."
+#~ msgstr "Der ausgewÃ¤hlte SchlÃ¼ssel ist nicht zum VerschlÃ¼sseln verfÃ¼gbar."
 
 #~ msgid "The key you selected is not available for signing"
-#~ msgstr "Der ausgewählte Schlüssel steht nicht zum Signieren zur Verfügung."
+#~ msgstr "Der ausgewÃ¤hlte SchlÃ¼ssel steht nicht zum Signieren zur VerfÃ¼gung."
 
 #~ msgid ""
 #~ "No public keys available.\n"
 #~ "Currently, there is nobody who could read a\n"
 #~ "file encrypted by you."
 #~ msgstr ""
-#~ "Kein öffentlicher Schlüssel verfügbar.\n"
+#~ "Kein Ã¶ffentlicher SchlÃ¼ssel verfÃ¼gbar.\n"
 #~ "Derzeit kann niemand eine Datei lesen,\n"
-#~ "die von Ihnen verschlüsselt wurde."
+#~ "die von Ihnen verschlÃ¼sselt wurde."
 
 #~ msgid "No secret keys available."
-#~ msgstr "Kein geheimer Schlüssel vorhanden."
+#~ msgstr "Kein geheimer SchlÃ¼ssel vorhanden."
 
 #~ msgid "Files in work"
-#~ msgstr "Ausgewählte Dateien"
+#~ msgstr "AusgewÃ¤hlte Dateien"
 
 #~ msgid ""
 #~ "Internal error:\n"
 #~ "Invalid sign mode"
 #~ msgstr ""
 #~ "Interner Fehler:\n"
-#~ "ungültige Signaturkennung"
+#~ "ungÃ¼ltige Signaturkennung"
 
 #~ msgid "No key selected!"
-#~ msgstr "Kein Schlüssel ausgewählt!"
+#~ msgstr "Kein SchlÃ¼ssel ausgewÃ¤hlt!"
 
 #~ msgid ""
 #~ "No secret keys available for signing.\n"
 #~ "Please generate or import a secret key first."
 #~ msgstr ""
-#~ "Kein geheimer Schlüssel zum Signieren vorhanden.\n"
-#~ "Bitte zuerst einen geheimen Schlüssel erzeugen oder importieren."
+#~ "Kein geheimer SchlÃ¼ssel zum Signieren vorhanden.\n"
+#~ "Bitte zuerst einen geheimen SchlÃ¼ssel erzeugen oder importieren."
 
 #~ msgid "Sign Files"
 #~ msgstr "Dateien signieren"
 
 # ~ msgid "Show Warranty Information\n"
-# ~ msgstr "Gewährleistung\n"
+# ~ msgstr "GewÃ¤hrleistung\n"
 #~ msgid "Filename"
 #~ msgstr "Dateiname"
 
 #~ msgid "The currently selected filename."
-#~ msgstr "Der momentan ausgewählte Dateiname."
+#~ msgstr "Der momentan ausgewÃ¤hlte Dateiname."
 
-#~ msgid "Show file operations"
-#~ msgstr "Dateiaktionen anzeigen"
-
 #~ msgid "Whether buttons for creating/manipulating files should be displayed."
 #~ msgstr ""
-#~ "Sollen Knöpfe zum Erstellen bzw. Verwalten von Dateien angezeigt werden?"
+#~ "Sollen KnÃ¶pfe zum Erstellen bzw. Verwalten von Dateien angezeigt werden?"
 
 #~ msgid "Directories"
 #~ msgstr "Verzeichnisse"
@@ -2297,14 +2406,14 @@
 #~ "Are you sure that you want to select it?"
 #~ msgstr ""
 #~ "Die Datei \"%s\" befindet sich auf einer anderen Maschine (%s)\n"
-#~ "und ist möglicherweise für dieses Programm nicht erreichbar.\n"
-#~ "Sind Sie sicher, dass Sie diese Datei auswählen möchten?"
+#~ "und ist mÃ¶glicherweise fÃ¼r dieses Programm nicht erreichbar.\n"
+#~ "Sind Sie sicher, dass Sie diese Datei auswÃ¤hlen mÃ¶chten?"
 
 #~ msgid "Create Dir"
 #~ msgstr "Verzeichnis erstellen"
 
 #~ msgid "Delete File"
-#~ msgstr "Datei löschen"
+#~ msgstr "Datei lÃ¶schen"
 
 #~ msgid "Rename File"
 #~ msgstr "Datei umbenennen"
@@ -2313,14 +2422,14 @@
 #~ msgstr "Fehler"
 
 #~ msgid "Close"
-#~ msgstr "Schließen"
+#~ msgstr "SchlieÃŸen"
 
 #~ msgid ""
 #~ "The directory name \"%s\" contains symbols that are not allowed in "
 #~ "filenames"
 #~ msgstr ""
-#~ "Der Verzeichnisname \"%s\" enthält Symbole, die nicht in Dateinamen "
-#~ "vorkommen dürfen."
+#~ "Der Verzeichnisname \"%s\" enthÃ¤lt Symbole, die nicht in Dateinamen "
+#~ "vorkommen dÃ¼rfen."
 
 #~ msgid ""
 #~ "Error creating directory \"%s\": %s\n"
@@ -2332,7 +2441,7 @@
 #~ msgid "You probably used symbols not allowed in filenames."
 #~ msgstr ""
 #~ "Sie haben wahrscheinlich Symbole benutzt, die nicht in Dateinamen "
-#~ "vorkommen dürfen."
+#~ "vorkommen dÃ¼rfen."
 
 #~ msgid "Error creating directory \"%s\": %s\n"
 #~ msgstr "Fehler beim Erstellen des Verzeichnisses \"%s\": %s\n"
@@ -2355,37 +2464,34 @@
 #~ msgid ""
 #~ "The filename \"%s\" contains symbols that are not allowed in filenames"
 #~ msgstr ""
-#~ "Der Dateiname \"%s\" enthält Symbole, die nicht in Dateinamen vorkommen "
-#~ "dürfen."
+#~ "Der Dateiname \"%s\" enthÃ¤lt Symbole, die nicht in Dateinamen vorkommen "
+#~ "dÃ¼rfen."
 
 #~ msgid ""
 #~ "Error deleting file \"%s\": %s\n"
 #~ "%s"
 #~ msgstr ""
-#~ "Fehler beim Löschen der Datei \"%s\": %s\n"
+#~ "Fehler beim LÃ¶schen der Datei \"%s\": %s\n"
 #~ "%s"
 
 #~ msgid "It probably contains symbols not allowed in filenames."
 #~ msgstr ""
-#~ "Sie enthält wahrscheinlich Symbole, die nicht in Dateinamen vorkommen "
-#~ "dürfen."
+#~ "Sie enthÃ¤lt wahrscheinlich Symbole, die nicht in Dateinamen vorkommen "
+#~ "dÃ¼rfen."
 
 #~ msgid "Error deleting file \"%s\": %s"
-#~ msgstr "Fehler beim Löschen der Datei \"%s\": %s"
+#~ msgstr "Fehler beim LÃ¶schen der Datei \"%s\": %s"
 
 #~ msgid "Really delete file \"%s\"?"
-#~ msgstr "Datei \"%s\" wirklich löschen?"
+#~ msgstr "Datei \"%s\" wirklich lÃ¶schen?"
 
 #~ msgid "_Delete"
-#~ msgstr "_Löschen"
+#~ msgstr "_LÃ¶schen"
 
-#~ msgid "Delete"
-#~ msgstr "Löschen"
-
 #~ msgid ""
 #~ "The file name \"%s\" contains symbols that are not allowed in filenames"
 #~ msgstr ""
-#~ "Der Dateiname \"%s\" enthält Symbole, die in Dateinamen nicht erlaubt "
+#~ "Der Dateiname \"%s\" enthÃ¤lt Symbole, die in Dateinamen nicht erlaubt "
 #~ "sind."
 
 #~ msgid ""
@@ -2406,7 +2512,7 @@
 #~ msgstr "Fehler beim Umbenennen der Datei \"%s\" in \"%s\": %s"
 
 #~ msgid "Rename file \"%s\" to:"
-#~ msgstr "Neuer Name für Datei \"%s\":"
+#~ msgstr "Neuer Name fÃ¼r Datei \"%s\":"
 
 #~ msgid "_Rename"
 #~ msgstr "_Umbenennen"
@@ -2434,10 +2540,10 @@
 #~ msgstr "01.01.2000"
 
 #~ msgid "expire a_t"
-#~ msgstr "verfä_llt am"
+#~ msgstr "verfÃ¤_llt am"
 
 #~ msgid "_Prev"
-#~ msgstr "_Zurück"
+#~ msgstr "_ZurÃ¼ck"
 
 #~ msgid "_Next"
 #~ msgstr "_Weiter"
@@ -2446,18 +2552,18 @@
 #~ "In \"Passphrase\" and \"Repeat passphrase\"\n"
 #~ "you must enter the same passphrase."
 #~ msgstr ""
-#~ "Bitte achten Sie darauf, daß Sie unter\n"
+#~ "Bitte achten Sie darauf, daÃŸ Sie unter\n"
 #~ "\"Passwortsatz\" und \"Passwortsatz wiederholen\"\n"
 #~ "genau denselben Passwortsatz eingeben."
 
 #~ msgid "generate re_vocation certificate"
-#~ msgstr "_Rückrufurkunde erzeugen"
+#~ msgstr "_RÃ¼ckrufurkunde erzeugen"
 
 #~ msgid "_send to key server"
 #~ msgstr "_Zum Key-Server schicken"
 
 #~ msgid "_Generate key"
-#~ msgstr "Schlüssel _erzeugen"
+#~ msgstr "SchlÃ¼ssel _erzeugen"
 
 #~ msgid "F_inish"
 #~ msgstr "F_ertig"
@@ -2466,16 +2572,16 @@
 #~ msgstr "Benutzerkennung"
 
 #~ msgid " Decrypt "
-#~ msgstr " Entschlüsseln "
+#~ msgstr " EntschlÃ¼sseln "
 
 #~ msgid "Invalid Date"
-#~ msgstr "Ungültiges Datum"
+#~ msgstr "UngÃ¼ltiges Datum"
 
 #~ msgid "/File/C_heck"
-#~ msgstr "/Datei/_Prüfen"
+#~ msgstr "/Datei/_PrÃ¼fen"
 
 #~ msgid "Open"
-#~ msgstr "öffnen"
+#~ msgstr "Ã¶ffnen"
 
 #~ msgid "NOTE: no default option file `%s'\n"
 #~ msgstr "HINWEIS: Keine Standard-Konfigurationsdatei `%s'\n"
@@ -2499,26 +2605,23 @@
 #~ msgstr "Aus _Zwischenablage importieren"
 
 #~ msgid "Missing public key"
-#~ msgstr "Öffentlicher Schlüssel fehlt"
+#~ msgstr "Ã–ffentlicher SchlÃ¼ssel fehlt"
 
 #~ msgid ""
 #~ "An error occured while receiving\n"
 #~ "the requested key from the keyserver."
 #~ msgstr ""
 #~ "Fehler beim Exportieren\n"
-#~ "geheimer Schlüssel."
+#~ "geheimer SchlÃ¼ssel."
 
-#~ msgid "Receive key from server"
-#~ msgstr "Schlüssel vom Key-Server _empfangen:"
-
 #~ msgid "_Key ID: "
-#~ msgstr "Schlüsselkennung:"
+#~ msgstr "SchlÃ¼sselkennung:"
 
 #~ msgid "_Receive"
-#~ msgstr "_Empfänger"
+#~ msgstr "_EmpfÃ¤nger"
 
 #~ msgid "Remove"
-#~ msgstr "Löschen"
+#~ msgstr "LÃ¶schen"
 
 #~ msgid "Set key server"
 #~ msgstr "Key-Server festlegen"
@@ -2527,7 +2630,7 @@
 #~ msgstr "_Key-Server: "
 
 #~ msgid "_Set"
-#~ msgstr "Über_nehmen"
+#~ msgstr "Ãœber_nehmen"
 
 #~ msgid "Fingerprint"
 #~ msgstr "Fingerabdruck:"
@@ -2539,14 +2642,14 @@
 #~ "No secret keys available to\n"
 #~ "select a default key from."
 #~ msgstr ""
-#~ "Keine geheimen Schlüssel für die Auswahl\n"
-#~ "eines Standard-Schlüssels vorhanden."
+#~ "Keine geheimen SchlÃ¼ssel fÃ¼r die Auswahl\n"
+#~ "eines Standard-SchlÃ¼ssels vorhanden."
 
 #~ msgid "/Options/_Keyserver"
 #~ msgstr "/Optionen/_Key-Server"
 
 #~ msgid "/Options/_Default Key"
-#~ msgstr "/Optionen/_Standard-Schlüssel"
+#~ msgstr "/Optionen/_Standard-SchlÃ¼ssel"
 
 #~ msgid "Signature"
 #~ msgstr "Signatur"
@@ -2555,25 +2658,25 @@
 #~ msgstr "Der Server antwortete mit einer Fehlermeldung."
 
 #~ msgid "Keyserver timeout"
-#~ msgstr "Server-Zeitüberschreitung"
+#~ msgstr "Server-ZeitÃ¼berschreitung"
 
 #~ msgid "Error initializing network"
 #~ msgstr "Fehler beim Initialisieren des Netzwerks"
 
 #~ msgid "Error resolving host name"
-#~ msgstr "Fehler bei der Namensauflösung"
+#~ msgstr "Fehler bei der NamensauflÃ¶sung"
 
 #~ msgid "Error while connecting to keyserver"
 #~ msgstr "Fehler beim Verbindungsaufbau zum Server"
 
 #~ msgid "No recipients chosen to encrypt for."
-#~ msgstr "Es sind keine Empfänger ausgewählt."
+#~ msgstr "Es sind keine EmpfÃ¤nger ausgewÃ¤hlt."
 
 #~ msgid "No file selected for verifying signature."
-#~ msgstr "Keine Datei zum Prüfen der Signatur ausgewählt."
+#~ msgstr "Keine Datei zum PrÃ¼fen der Signatur ausgewÃ¤hlt."
 
 #~ msgid "Verifying file signature"
-#~ msgstr "Dateisignatur prüfen"
+#~ msgstr "Dateisignatur prÃ¼fen"
 
 #~ msgid "Filename: "
 #~ msgstr "Dateiname: "
@@ -2588,10 +2691,10 @@
 #~ msgstr "Sign. gesamt"
 
 #~ msgid "Valid Sigs"
-#~ msgstr "Gültige Sign."
+#~ msgstr "GÃ¼ltige Sign."
 
 #~ msgid "Invalid Sigs"
-#~ msgstr "Ungültige Sign."
+#~ msgstr "UngÃ¼ltige Sign."
 
 #~ msgid "Info"
 #~ msgstr "Info"
@@ -2600,7 +2703,7 @@
 #~ msgstr "Klartext"
 
 #~ msgid "protected"
-#~ msgstr "geschützt"
+#~ msgstr "geschÃ¼tzt"
 
 #~ msgid "clearsigned"
 #~ msgstr "Klartext-Signatur"
@@ -2609,52 +2712,49 @@
 #~ msgstr "separate Signatur"
 
 #~ msgid "No key selected for detail view."
-#~ msgstr "Kein Schlüssel für Detailansicht ausgewählt."
+#~ msgstr "Kein SchlÃ¼ssel fÃ¼r Detailansicht ausgewÃ¤hlt."
 
 #~ msgid "Show public key detail"
-#~ msgstr "Detailansicht öffentlicher Schlüssel"
+#~ msgstr "Detailansicht Ã¶ffentlicher SchlÃ¼ssel"
 
 #~ msgid "Fingerprint: "
 #~ msgstr "Fingerabdruck: "
 
 #~ msgid "Key owner"
-#~ msgstr "Schlüsseleigentümer"
+#~ msgstr "SchlÃ¼sseleigentÃ¼mer"
 
 #~ msgid "Add _default recipients:"
-#~ msgstr "_Empfänger hinzufügen"
+#~ msgstr "_EmpfÃ¤nger hinzufÃ¼gen"
 
 #~ msgid "Rec_ipients"
-#~ msgstr "_Empfänger"
+#~ msgstr "_EmpfÃ¤nger"
 
 #~ msgid "Remo_ve keys from recipients"
-#~ msgstr "Schlüssel von Empfängern _entfernen"
+#~ msgstr "SchlÃ¼ssel von EmpfÃ¤ngern _entfernen"
 
 #~ msgid "Add _keys to recipients"
-#~ msgstr "_Schlüssel zu Empfängern hinzufügen"
+#~ msgstr "_SchlÃ¼ssel zu EmpfÃ¤ngern hinzufÃ¼gen"
 
 #~ msgid "S_how detail"
 #~ msgstr "Detail _zeigen"
 
 #~ msgid "Save encrypted file _as: "
-#~ msgstr "Verschlüsselte Datei speichern als: "
+#~ msgstr "VerschlÃ¼sselte Datei speichern als: "
 
 #~ msgid "   _Browse   "
 #~ msgstr "   _Durchsuchen   "
 
 #~ msgid "Save encrypted file as"
-#~ msgstr "Verschlüsselte Datei speichern als"
+#~ msgstr "VerschlÃ¼sselte Datei speichern als"
 
-#~ msgid "_Encrypt"
-#~ msgstr "_Verschlüsseln"
-
 #~ msgid "Protect files by Password"
-#~ msgstr "Dateien mit Passwort schützen"
+#~ msgstr "Dateien mit Passwort schÃ¼tzen"
 
 #~ msgid "Save protected _file as: "
-#~ msgstr "Geschützte _Datei speichern unter: "
+#~ msgstr "GeschÃ¼tzte _Datei speichern unter: "
 
 #~ msgid "Save protected file as"
-#~ msgstr "Geschützte Datei speichern unter"
+#~ msgstr "GeschÃ¼tzte Datei speichern unter"
 
 #~ msgid "P_assword: "
 #~ msgstr "P_asswort: "
@@ -2663,19 +2763,19 @@
 #~ msgstr "Pa_sswort wiederholen: "
 
 #~ msgid "_Protect"
-#~ msgstr "_Schützen"
+#~ msgstr "_SchÃ¼tzen"
 
 #~ msgid "No files selected to decrypt."
-#~ msgstr "Keine Dateien zum Entschlüsseln ausgewählt."
+#~ msgstr "Keine Dateien zum EntschlÃ¼sseln ausgewÃ¤hlt."
 
 #~ msgid "Save decrypted file as"
-#~ msgstr "Entschlüsselte Datei speichern unter"
+#~ msgstr "EntschlÃ¼sselte Datei speichern unter"
 
 #~ msgid "No keys selected to remove from recipients list"
-#~ msgstr "Keine Schlüssel aus Empfängerliste ausgewählt"
+#~ msgstr "Keine SchlÃ¼ssel aus EmpfÃ¤ngerliste ausgewÃ¤hlt"
 
 #~ msgid "No keys selected to add to recipients list."
-#~ msgstr "Keine Schlüssel ausgewählt"
+#~ msgstr "Keine SchlÃ¼ssel ausgewÃ¤hlt"
 
 #~ msgid "don't trust"
 #~ msgstr "kein Vertrauen"
@@ -2687,31 +2787,31 @@
 #~ msgstr "volles Vertrauen"
 
 #~ msgid "trust ultimately"
-#~ msgstr "vollständiges Vertrauen"
+#~ msgstr "vollstÃ¤ndiges Vertrauen"
 
 #~ msgid "invalid"
-#~ msgstr "ungültig"
+#~ msgstr "ungÃ¼ltig"
 
 #~ msgid "ElGamal (sign and encrypt)"
-#~ msgstr "ElGamal (signieren und verschlüsseln)"
+#~ msgstr "ElGamal (signieren und verschlÃ¼sseln)"
 
 #~ msgid "ElGamal (encrypt only)"
-#~ msgstr "ElGamal (nur verschlüsseln)"
+#~ msgstr "ElGamal (nur verschlÃ¼sseln)"
 
 #~ msgid "!INVALID!"
-#~ msgstr "!UNGÜLTIG!"
+#~ msgstr "!UNGÃœLTIG!"
 
 #~ msgid "/_Info"
 #~ msgstr "/_Info"
 
 #~ msgid "/Info/_Warranty"
-#~ msgstr "/Info/_Gewährleistung"
+#~ msgstr "/Info/_GewÃ¤hrleistung"
 
 #~ msgid "Change _trust"
-#~ msgstr "_Benutzervertrauen ändern"
+#~ msgstr "_Benutzervertrauen Ã¤ndern"
 
 #~ msgid "Export keys"
-#~ msgstr "Schlüssel exportieren"
+#~ msgstr "SchlÃ¼ssel exportieren"
 
 #~ msgid "Directory does not exist"
 #~ msgstr "Verzeichnis existiert nicht"
@@ -2721,13 +2821,13 @@
 #~ "Do you want to create it now?"
 #~ msgstr ""
 #~ "Verzeichnis %s existiert nicht.\n"
-#~ "Möchten Sie es jetzt erstellen?"
+#~ "MÃ¶chten Sie es jetzt erstellen?"
 
 #~ msgid "Error creating directory"
 #~ msgstr "Fehler beim Erstellen des Verzeichnisses"
 
 #~ msgid "Backup Directory"
-#~ msgstr "Verzeichnis für Sicherheitskopie"
+#~ msgstr "Verzeichnis fÃ¼r Sicherheitskopie"
 
 #~ msgid ""
 #~ "Please enter a directory where your backup keys should be saved.\n"
@@ -2735,7 +2835,7 @@
 #~ "GPA will create two files in that directory: pub_key.asc and sec_key.asc"
 #~ msgstr ""
 #~ "Bitte geben Sie ein Verzeichnis zur Speicherung der Sicherheitskopie "
-#~ "Ihres neuen Schlüssels an. Wir empfehlen die Sicherung auf einer Diskette "
+#~ "Ihres neuen SchlÃ¼ssels an. Wir empfehlen die Sicherung auf einer Diskette "
 #~ "(Laufwerk A:\\).\n"
 #~ "GPA wird dort die beiden Dateien pub_key.asc und sec_key.asc speichern."
 
@@ -2743,25 +2843,25 @@
 #~ msgstr "Verzeichnis:"
 
 #~ msgid "_Overwrite"
-#~ msgstr "_Überschreiben"
+#~ msgstr "_Ãœberschreiben"
 
 #~ msgid "File exists"
 #~ msgstr "Datei existiert"
 
 #~ msgid "Please enter a valid directory"
-#~ msgstr "Bitte geben Sie ein gültiges Verzeichnis an"
+#~ msgstr "Bitte geben Sie ein gÃ¼ltiges Verzeichnis an"
 
 #~ msgid "Key Trust"
-#~ msgstr "Schlüsselvertrauen"
+#~ msgstr "SchlÃ¼sselvertrauen"
 
 #~ msgid "No key defined"
-#~ msgstr "Kein Schlüssel"
+#~ msgstr "Kein SchlÃ¼ssel"
 
 #~ msgid "No key backup"
 #~ msgstr "Keine Sicherheitskopie"
 
 #~ msgid "Key Trust:"
-#~ msgstr "Schlüsselvertrauen:"
+#~ msgstr "SchlÃ¼sselvertrauen:"
 
 #~ msgid "User ID:"
 #~ msgstr "Benutzerkennung:"
@@ -2770,7 +2870,7 @@
 #~ msgstr "1"
 
 #~ msgid "Keys exported."
-#~ msgstr "Schlüssel exportiert."
+#~ msgstr "SchlÃ¼ssel exportiert."
 
 #~ msgid "Export to _file: "
 #~ msgstr "Exportieren in _Datei: "
@@ -2782,49 +2882,43 @@
 #~ msgstr "Benutzervertrauen in Datei exportieren"
 
 #~ msgid "No keys selected to delete."
-#~ msgstr "Keine Schlüssel zum Löschen ausgewählt."
+#~ msgstr "Keine SchlÃ¼ssel zum LÃ¶schen ausgewÃ¤hlt."
 
 #~ msgid "!FATAL ERROR: Invalid key selection info!\n"
 #~ msgstr "!FATAL ERROR: Invalid key selection info!\n"
 
 #~ msgid "Revocation certificate created."
-#~ msgstr "Rückrufurkunde erzeugt."
+#~ msgstr "RÃ¼ckrufurkunde erzeugt."
 
 #~ msgid "No key selected for editing."
-#~ msgstr "Kein Schlüssel zum Bearbeiten ausgewählt."
+#~ msgstr "Kein SchlÃ¼ssel zum Bearbeiten ausgewÃ¤hlt."
 
 #~ msgid "Secret key editor"
-#~ msgstr "Schlüsseleditor für geheimen Schlüssel"
+#~ msgstr "SchlÃ¼sseleditor fÃ¼r geheimen SchlÃ¼ssel"
 
 #~ msgid "Create Re_vocation"
-#~ msgstr "_Rückrufurkunde erzeugen"
+#~ msgstr "_RÃ¼ckrufurkunde erzeugen"
 
 #~ msgid "E_xport key"
-#~ msgstr "Schlüssel e_xportieren"
+#~ msgstr "SchlÃ¼ssel e_xportieren"
 
 #~ msgid "_Save and exit"
-#~ msgstr "_Speichern und Schließen"
+#~ msgstr "_Speichern und SchlieÃŸen"
 
 #~ msgid "E_xport keys"
-#~ msgstr "Schlüssel e_xportieren"
+#~ msgstr "SchlÃ¼ssel e_xportieren"
 
-#~ msgid "_Delete keys"
-#~ msgstr "Schlüssel _löschen"
-
 #~ msgid "_Edit key"
-#~ msgstr "Schlüssel _bearbeiten"
+#~ msgstr "SchlÃ¼ssel _bearbeiten"
 
 #~ msgid "No keys selected to create revocation certificate for."
-#~ msgstr "Keine Schlüssel ausgewählt."
+#~ msgstr "Keine SchlÃ¼ssel ausgewÃ¤hlt."
 
-#~ msgid "Generate revocation certificate"
-#~ msgstr "Rückrufurkunde erzeugen"
-
 #~ msgid "_Secret keys"
-#~ msgstr "Geheime _Schlüssel"
+#~ msgstr "Geheime _SchlÃ¼ssel"
 
 #~ msgid "Import keys"
-#~ msgstr "Schlüssel importieren"
+#~ msgstr "SchlÃ¼ssel importieren"
 
 #~ msgid "Import ownertrust"
 #~ msgstr "Benutzervertrauen importieren"
@@ -2836,29 +2930,29 @@
 #~ "No public keys available to denote\n"
 #~ "as default recipients."
 #~ msgstr ""
-#~ "Keine öffentlichen Schlüssel für die\n"
-#~ "Auswahl der Empfänger vorhanden."
+#~ "Keine Ã¶ffentlichen SchlÃ¼ssel fÃ¼r die\n"
+#~ "Auswahl der EmpfÃ¤nger vorhanden."
 
 #~ msgid "_Remove from recipients"
-#~ msgstr "Aus Empfängerliste ent_fernen"
+#~ msgstr "Aus EmpfÃ¤ngerliste ent_fernen"
 
 #~ msgid "_Add to recipients"
-#~ msgstr "Zu Empfängerliste _hinzufügen"
+#~ msgstr "Zu EmpfÃ¤ngerliste _hinzufÃ¼gen"
 
 #~ msgid "/Options/Default _Recipients"
-#~ msgstr "/Optionen/_Empfängerliste"
+#~ msgstr "/Optionen/_EmpfÃ¤ngerliste"
 
 #~ msgid "Invalid ownertrust level."
-#~ msgstr "Ungültige Benutzervertrauen-Stufe."
+#~ msgstr "UngÃ¼ltige Benutzervertrauen-Stufe."
 
 #~ msgid "_Ownertrust level: "
 #~ msgstr "_Benutzervertrauen-Stufe: "
 
 #~ msgid "_Accept"
-#~ msgstr "_Übernehmen"
+#~ msgstr "_Ãœbernehmen"
 
 #~ msgid "_Open"
-#~ msgstr "_Öffnen"
+#~ msgstr "_Ã–ffnen"
 
 #~ msgid ""
 #~ "The keyserver returned an error message:\n"
@@ -2882,44 +2976,44 @@
 #~ msgstr "Auf die Datei kann nicht zugegriffen werden"
 
 #~ msgid "Not a regular file"
-#~ msgstr "Keine reguläre Datei"
+#~ msgstr "Keine regulÃ¤re Datei"
 
 #~ msgid "Missing file name"
 #~ msgstr "Dateiname fehlt"
 
 #~ msgid "Missing private key ID for signing"
 #~ msgstr ""
-#~ "Es wurde kein geheimer Schlüssel angegeben,\n"
-#~ "mit dem die Unterschrift ausgeführt werden kann."
+#~ "Es wurde kein geheimer SchlÃ¼ssel angegeben,\n"
+#~ "mit dem die Unterschrift ausgefÃ¼hrt werden kann."
 
 #~ msgid "Invalid signature type"
-#~ msgstr "Ungültiger Signaturtyp"
+#~ msgstr "UngÃ¼ltiger Signaturtyp"
 
 #~ msgid "Missing public key ID(s) for encrypting"
 #~ msgstr ""
-#~ "Es wurde kein öffentlicher Schlüssel angegeben,\n"
-#~ "für den verschlüsselt werden soll."
+#~ "Es wurde kein Ã¶ffentlicher SchlÃ¼ssel angegeben,\n"
+#~ "fÃ¼r den verschlÃ¼sselt werden soll."
 
 #~ msgid "Missing passphrase for symmetric encrypting"
-#~ msgstr "Passwortsatz für symmetrische Verschlüsselung fehlt"
+#~ msgstr "Passwortsatz fÃ¼r symmetrische VerschlÃ¼sselung fehlt"
 
 #~ msgid "Missing passphrase for decrypting"
-#~ msgstr "Passwortsatz für Entschlüsselung fehlt"
+#~ msgstr "Passwortsatz fÃ¼r EntschlÃ¼sselung fehlt"
 
 #~ msgid "GnuPG execution aborted"
-#~ msgstr "Die Ausführung von GnuPG wurde abgebrochen."
+#~ msgstr "Die AusfÃ¼hrung von GnuPG wurde abgebrochen."
 
 #~ msgid "Invalid file: bad armor"
-#~ msgstr "Fehlerhafte Datei: ungültige ASCII-Verpackung"
+#~ msgstr "Fehlerhafte Datei: ungÃ¼ltige ASCII-Verpackung"
 
 #~ msgid "Invalid file: bad MDC"
-#~ msgstr "Fehlerhafte Datei: ungültige MDC"
+#~ msgstr "Fehlerhafte Datei: ungÃ¼ltige MDC"
 
 #~ msgid "Decryption failed"
-#~ msgstr "Entschlüsselung fehlgeschlagen"
+#~ msgstr "EntschlÃ¼sselung fehlgeschlagen"
 
 #~ msgid "Delete problem"
-#~ msgstr "Problem beim Löschen"
+#~ msgstr "Problem beim LÃ¶schen"
 
 #~ msgid "Error in MDC"
 #~ msgstr "Fehler in MDC"
@@ -2934,14 +3028,14 @@
 #~ msgstr "Passwortsatz fehlt"
 
 #~ msgid "No valid OpenPGP data found"
-#~ msgstr "Keine gültigen OpenPGP-Daten gefunden"
+#~ msgstr "Keine gÃ¼ltigen OpenPGP-Daten gefunden"
 
 #~ msgid ""
 #~ "GnuPG execution failed:\n"
 #~ "internal error while setting\n"
 #~ "command handler"
 #~ msgstr ""
-#~ "GnuPG-Ausführung fehlgeschlagen:\n"
+#~ "GnuPG-AusfÃ¼hrung fehlgeschlagen:\n"
 #~ "Interner Fehler beim Setzen des\n"
 #~ "\"command handler\""
 
@@ -2949,7 +3043,7 @@
 #~ "GnuPG execution failed:\n"
 #~ "could not spawn external program"
 #~ msgstr ""
-#~ "GnuPG-Ausführung fehlgeschlagen:\n"
+#~ "GnuPG-AusfÃ¼hrung fehlgeschlagen:\n"
 #~ "Externes Programm kann nicht aufgerufen werden"
 
 #~ msgid "GnuPG execution terminated"
@@ -2960,10 +3054,7 @@
 #~ "Fehlerhafte Anzahl von Feldern in der Ausgabe von `gpg --check-sigs'"
 
 #~ msgid "No valid public key specified"
-#~ msgstr "Kein gültiger öffentlicher Schlüssel angegeben"
+#~ msgstr "Kein gÃ¼ltiger Ã¶ffentlicher SchlÃ¼ssel angegeben"
 
 #~ msgid "No valid secret key specified"
-#~ msgstr "Kein gültiger geheimer Schlüssel angegeben"
-
-#~ msgid "No valid passphrase specified"
-#~ msgstr "Kein gültiger Passwortsatz angegeben"
+#~ msgstr "Kein gÃ¼ltiger geheimer SchlÃ¼ssel angegeben"

Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/es.po	2008-05-08 12:53:41 UTC (rev 891)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.7.0\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-03-20 22:28+0100\n"
+"POT-Creation-Date: 2008-05-08 14:51+0200\n"
 "PO-Revision-Date: 2008-03-11 09:35+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <es at li.org>\n"
@@ -18,334 +18,154 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/clipboard.c:381 src/fileman.c:393
+#: src/clipboard.c:376 src/fileman.c:392
 msgid "Open File"
 msgstr "Abrir Archivo"
 
-#: src/clipboard.c:409 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "Mensaje de GPA"
 
 #. TRANSLATORS: The arguments are the filename, the integer size
 #. and the unit (such as KB or MB).
-#: src/clipboard.c:426
+#: src/clipboard.c:421
 #, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
 msgstr ""
 "El fichero %s tiene un tamaÃ±o de %lli%s. Â¿Estas seguro de que quieres "
 "abrirlo?"
 
-#: src/clipboard.c:547
+#: src/clipboard.c:542
 msgid "Save As..."
 msgstr "Guardar Como..."
 
-#: src/clipboard.c:588 src/clipboard.c:618 src/clipboard.c:648
-#: src/clipboard.c:678 src/clipboard.c:1184 src/fileman.c:716
-#: src/keyring.c:1657
+#: src/clipboard.c:583 src/clipboard.c:613 src/clipboard.c:643
+#: src/clipboard.c:673 src/clipboard.c:1034
 msgid "Clipboard"
 msgstr "Portapapeles"
 
-#: src/clipboard.c:758 src/fileman.c:513 src/keyring.c:863
-msgid "/_File"
+#: src/clipboard.c:755 src/fileman.c:515 src/keyring.c:884
+#, fuzzy
+msgid "_File"
 msgstr "/_Archivo"
 
-#: src/clipboard.c:759 src/fileman.c:515
-msgid "/File/C_lear"
-msgstr "/Archivo/Li_mpiar"
-
-#: src/clipboard.c:760 src/fileman.c:514
-msgid "/File/_Open"
-msgstr "/Archivo/_Abrir"
-
-#: src/clipboard.c:761
-msgid "/File/Save _As"
-msgstr "/Archivo/Guardar _Como"
-
-#: src/clipboard.c:763 src/fileman.c:516
-msgid "/File/sep1"
-msgstr "/Archivo/sep1"
-
-#: src/clipboard.c:764 src/fileman.c:517
-msgid "/File/_Sign"
-msgstr "/Archivo/_Firmar"
-
-#: src/clipboard.c:765 src/fileman.c:518
-msgid "/File/_Verify"
-msgstr "/Archivo/_Verificar"
-
-#: src/clipboard.c:766 src/fileman.c:519
-msgid "/File/_Encrypt"
-msgstr "/Archivo/_Cifrar"
-
-#: src/clipboard.c:767 src/fileman.c:520
-msgid "/File/_Decrypt"
-msgstr "/Archivo/_Descifrar"
-
-#: src/clipboard.c:768 src/fileman.c:521
-msgid "/File/sep2"
-msgstr "/Archivo/sep2"
-
-#: src/clipboard.c:769 src/fileman.c:522 src/keyring.c:864
-msgid "/File/_Close"
-msgstr "/Archivo/C_errar"
-
-#: src/clipboard.c:770 src/fileman.c:523 src/keyring.c:866
-msgid "/File/_Quit"
-msgstr "/Archivo/_Salir"
-
-#: src/clipboard.c:773 src/fileman.c:526 src/keyring.c:869
-msgid "/_Edit"
+#: src/clipboard.c:756 src/fileman.c:516 src/keyring.c:885
+#, fuzzy
+msgid "_Edit"
 msgstr "/_Editar"
 
-#: src/clipboard.c:776
-msgid "/Edit/_Undo"
-msgstr "/Editar/_Copiar"
+#: src/clipboard.c:760
+msgid "Clear buffer"
+msgstr "Limpiar buffer"
 
-#: src/clipboard.c:777
-msgid "/Edit/_Redo"
-msgstr "/Editar/_Rehacer"
+#: src/clipboard.c:762 src/fileman.c:520
+msgid "Open a file"
+msgstr "Abrir un archivo"
 
-#: src/clipboard.c:778
-msgid "/Edit/sep0"
-msgstr "/Editar/sep0"
+#: src/clipboard.c:764
+msgid "Save to a file"
+msgstr "Guardar a un archivo"
 
-#: src/clipboard.c:780 src/clipboard.c:816
-msgid "/Edit/Cut"
-msgstr "/Editar/Co_rtar"
+#: src/clipboard.c:766
+#, fuzzy
+msgid "Sign buffer text"
+msgstr "firmar texto"
 
-#: src/clipboard.c:781 src/keyring.c:870
-msgid "/Edit/_Copy"
-msgstr "/Editar/_Copiar"
+#: src/clipboard.c:768
+#, fuzzy
+msgid "Check signatures of buffer text"
+msgstr "Comprobar las firmas en el texto seleccionado"
 
-#: src/clipboard.c:782 src/keyring.c:872
-msgid "/Edit/_Paste"
-msgstr "/Editar/_Pegar"
+#: src/clipboard.c:770
+#, fuzzy
+msgid "Encrypt the buffer text"
+msgstr "Cifrar el texto seleccionado"
 
-#: src/clipboard.c:783
-msgid "/Edit/_Delete"
-msgstr "/Editar/_Eliminar"
+#: src/clipboard.c:772
+#, fuzzy
+msgid "Decrypt the buffer text"
+msgstr "Descifrar el texto seleccionado"
 
-#: src/clipboard.c:784 src/keyring.c:874
-msgid "/Edit/sep1"
-msgstr "/Editar/sep1"
-
-#: src/clipboard.c:785 src/fileman.c:527 src/keyring.c:875
-msgid "/Edit/Select _All"
-msgstr "/Editar/Seleccionar _Todo"
-
-#: src/clipboard.c:787 src/fileman.c:528 src/keyring.c:876
-msgid "/Edit/sep2"
-msgstr "/Editar/sep2"
-
-#: src/clipboard.c:788 src/fileman.c:529 src/keyring.c:877
-msgid "/Edit/Pr_eferences..."
-msgstr "/Editar/Pr_eferencias..."
-
-#: src/clipboard.c:790 src/fileman.c:531 src/keyring.c:879
-msgid "/Edit/_Backend Preferences..."
-msgstr "/Editar/Pr_eferencias del motor..."
-
-#: src/clipboard.c:794 src/fileman.c:535 src/keyring.c:906
-msgid "/_Windows"
-msgstr "/_Ventanas"
-
-#: src/clipboard.c:795 src/fileman.c:536 src/keyring.c:907
-msgid "/Windows/_Keyring Editor"
-msgstr "/Ventanas/_Editor Anillo de Claves"
-
-#: src/clipboard.c:796 src/fileman.c:537
-msgid "/Windows/_Filemanager"
-msgstr "/Ventanas/Gestor de _Archivos"
-
-#: src/clipboard.c:797 src/fileman.c:538 src/keyring.c:909
-msgid "/Windows/_Clipboard"
-msgstr "/Ventanas/_Portapapeles"
-
-#: src/clipboard.c:824 src/keyring.c:948
-msgid "/Edit/Copy"
-msgstr "/Editar/Copiar"
-
-#: src/clipboard.c:832
-msgid "/Edit/Delete"
-msgstr "/Editar/Eliminar"
-
-#: src/clipboard.c:840
-msgid "/Edit/Paste"
-msgstr "/Editar/Pegar"
-
-#: src/clipboard.c:945
-msgid "Clear buffer"
+#: src/clipboard.c:774
+#, fuzzy
+msgid "Close the buffer"
 msgstr "Limpiar buffer"
 
-#: src/clipboard.c:945
-msgid "clear buffer"
-msgstr "limpiar buffer"
+#: src/clipboard.c:776 src/fileman.c:534 src/keyring.c:893
+msgid "Quit the program"
+msgstr ""
 
-#: src/clipboard.c:953 src/fileman.c:643
-msgid "Open a file"
-msgstr "Abrir un archivo"
+#: src/clipboard.c:782
+#, fuzzy
+msgid "Undo the last action"
+msgstr "Copiar la selecciÃ³n"
 
-#: src/clipboard.c:953 src/fileman.c:643
-msgid "open file"
-msgstr "abrir archivo"
+#: src/clipboard.c:784
+msgid "Redo the last undone action"
+msgstr ""
 
-#: src/clipboard.c:958
-msgid "Save to a file"
-msgstr "Guardar a un archivo"
-
-#: src/clipboard.c:958
-msgid "save file as"
-msgstr "guardar archivo como"
-
-#: src/clipboard.c:966
+#: src/clipboard.c:787
 msgid "Cut the selection"
 msgstr "Cortar la selecciÃ³n"
 
-#: src/clipboard.c:967
-msgid "cut the selection"
-msgstr "cortar la selecciÃ³n"
-
-#: src/clipboard.c:973
+#: src/clipboard.c:789 src/keyring.c:897
 msgid "Copy the selection"
 msgstr "Copiar la selecciÃ³n"
 
-#: src/clipboard.c:974
-msgid "copy the selection"
-msgstr "copiar la selecciÃ³n"
-
-#: src/clipboard.c:980
+#: src/clipboard.c:791 src/keyring.c:899
 msgid "Paste the clipboard"
 msgstr "Pegar el portapapeles"
 
-#: src/clipboard.c:981
-msgid "paste the clipboard"
-msgstr "pegar el portapapeles"
-
-#: src/clipboard.c:991 src/fileman.c:653 src/keyring.c:1570
-msgid "Sign"
-msgstr "Firmar"
-
-#: src/clipboard.c:992
-msgid "Sign the selected text"
-msgstr "Firmar el texto seleccionado"
-
-#: src/clipboard.c:993
-msgid "sign text"
-msgstr "firmar texto"
-
-#: src/clipboard.c:1001 src/fileman.c:664
-msgid "Verify"
-msgstr "Verificar"
-
-#: src/clipboard.c:1002
-msgid "Check signatures of selected text"
-msgstr "Comprobar las firmas en el texto seleccionado"
-
-#: src/clipboard.c:1003
-msgid "verify text"
-msgstr "verificar texto"
-
-#: src/clipboard.c:1011 src/fileman.c:675
-msgid "Encrypt"
-msgstr "Cifrar"
-
-#: src/clipboard.c:1012
-msgid "Encrypt the selected text"
-msgstr "Cifrar el texto seleccionado"
-
-#: src/clipboard.c:1013
-msgid "encrypt text"
-msgstr "cifrar texto"
-
-#: src/clipboard.c:1021 src/fileman.c:686
-msgid "Decrypt"
-msgstr "Descifrar"
-
-#: src/clipboard.c:1022
-msgid "Decrypt the selected text"
+#: src/clipboard.c:793
+#, fuzzy
+msgid "Delete the selected text"
 msgstr "Descifrar el texto seleccionado"
 
-#: src/clipboard.c:1023
-msgid "decrypt text"
-msgstr "descifrar texto"
+#: src/clipboard.c:795
+msgid "Select the entire document"
+msgstr ""
 
-#: src/clipboard.c:1033 src/fileman.c:699 src/keyring.c:1631
-msgid "Open the preferences dialog"
-msgstr "Abrir la ventana de preferencias"
-
-#: src/clipboard.c:1034 src/fileman.c:700 src/keyring.c:1632
-msgid "preferences"
-msgstr "preferencias"
-
-#: src/clipboard.c:1041 src/fileman.c:707
+#: src/clipboard.c:902 src/fileman.c:625
 msgid "Keyring"
 msgstr "Anillo de claves"
 
-#: src/clipboard.c:1042 src/fileman.c:708
-msgid "Open the keyring editor"
-msgstr "Abrir el editor de anillo de claves"
-
-#: src/clipboard.c:1043 src/fileman.c:709
-msgid "keyring editor"
-msgstr "editor del anillo de claves"
-
-#: src/clipboard.c:1049 src/keyring.c:1648
+#: src/clipboard.c:904 src/keyring.c:1073
 msgid "Files"
 msgstr "Archivos"
 
-#: src/clipboard.c:1050 src/keyring.c:1649
-msgid "Open the file manager"
-msgstr "Abrir el gestor de archivos"
-
-#: src/clipboard.c:1051 src/keyring.c:1650
-msgid "file manager"
-msgstr "gestor de archivos"
-
-#: src/clipboard.c:1058 src/fileman.c:725 src/keyring.c:1665
-msgid "Help"
-msgstr "Ayuda"
-
-#: src/clipboard.c:1059 src/fileman.c:726 src/keyring.c:1666
-msgid "Understanding the GNU Privacy Assistant"
-msgstr "Comprendiendo el GNU Privacy Assistant"
-
-#: src/clipboard.c:1060 src/fileman.c:727 src/keyring.c:1667
-msgid "help"
-msgstr "ayuda"
-
-#: src/clipboard.c:1150
+#: src/clipboard.c:1004
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Privacy Assistant - Portapapeles"
 
-#: src/confdialog.c:993
+#: src/confdialog.c:994
 msgid "<b>Main</b>"
 msgstr "<b>Principal</b>"
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default values"
 msgstr "Usar valores predeterminados"
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default value"
 msgstr "Usar valor predeterminado"
 
-#: src/confdialog.c:1146
+#: src/confdialog.c:1147
 msgid "Do not use option"
 msgstr "No usar la opciÃ³n"
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom values"
 msgstr "Usar valores personalizados"
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom value"
 msgstr "Usar valor personalizado"
 
-#: src/confdialog.c:1155
+#: src/confdialog.c:1156
 msgid "Use default argument"
 msgstr "Usar argumentos predeterminados"
 
-#: src/confdialog.c:1280
+#: src/confdialog.c:1281
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
@@ -353,58 +173,51 @@
 "Hay cambios que no han sido aplicados. Al cambiar la configuraciÃ³n experta "
 "estos cambios se aplicarÃ¡n. Â¿Desea continuar?"
 
-#: src/confdialog.c:1325
+#: src/confdialog.c:1326
 msgid "Crypto Backend Configuration"
 msgstr "ConfiguraciÃ³n del motor de cifrado"
 
-#: src/confdialog.c:1334
+#: src/confdialog.c:1332
 msgid "Reset"
 msgstr "Restablecer"
 
-#: src/confdialog.c:1346
+#: src/confdialog.c:1351
 msgid "Configure the tools of the GnuPG system."
 msgstr "Configurar las herramientas del sistema GnuPG."
 
-#: src/confdialog.c:1350
+#: src/confdialog.c:1355
 msgid "Level:"
 msgstr "Nivel:"
 
-#: src/confdialog.c:1359
+#: src/confdialog.c:1364
 msgid "Basic"
 msgstr "BÃ¡sico"
 
-#: src/confdialog.c:1360
+#: src/confdialog.c:1365
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: src/confdialog.c:1361
+#: src/confdialog.c:1366
 msgid "Expert"
 msgstr "Experto"
 
-#: src/encryptdlg.c:142 src/expirydlg.c:116 src/filesigndlg.c:133
-#: src/gpaprogressdlg.c:146 src/gparecvkeydlg.c:96 src/gpawizard.c:289
-#: src/gpgmetools.c:705 src/keygendlg.c:149 src/ownertrustdlg.c:111
-#: src/passwddlg.c:100
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: src/encryptdlg.c:143
+#: src/encryptdlg.c:139
 msgid "Encrypt documents"
 msgstr "Cifrar documentos"
 
-#: src/encryptdlg.c:174
+#: src/encryptdlg.c:156
 msgid "_Public Keys"
 msgstr "Claves _PÃºblicas"
 
-#: src/encryptdlg.c:177
+#: src/encryptdlg.c:179 src/icons.c:198
 msgid "_Sign"
 msgstr "_Firmar"
 
-#: src/encryptdlg.c:201 src/filesigndlg.c:185
+#: src/encryptdlg.c:185
 msgid "Sign _as "
 msgstr "Firmar _como"
 
-#: src/encryptdlg.c:215 src/filesigndlg.c:187
+#: src/encryptdlg.c:215 src/filesigndlg.c:227
 msgid "A_rmor"
 msgstr "A_rmadura"
 
@@ -412,116 +225,94 @@
 msgid "Please provide a correct date."
 msgstr "Por favor, proporcione una fecha correcta"
 
-#: src/expirydlg.c:111
+#: src/expirydlg.c:108
 msgid "Change expiry date"
 msgstr "Cambiar fecha de caducidad"
 
-#: src/expirydlg.c:129
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: src/expirydlg.c:124
 msgid "_never expire"
 msgstr "_nunca caduca"
 
-#: src/expirydlg.c:134
+#: src/expirydlg.c:129
 msgid "_expire on:"
 msgstr "_caduca el:"
 
-#: src/fileman.c:557
-msgid "/File/Sign"
-msgstr "/Archivo/Firmar"
-
-#: src/fileman.c:562
-msgid "/File/Verify"
-msgstr "/Archivo/Verificar"
-
-#: src/fileman.c:567
-msgid "/File/Encrypt"
-msgstr "/Archivo/Cifrar"
-
-#: src/fileman.c:572
-msgid "/File/Decrypt"
-msgstr "/Archivo/Descifrar"
-
-#: src/fileman.c:647
+#: src/fileman.c:522
 msgid "Close all files"
 msgstr "Cerrar todos los archivos"
 
-#: src/fileman.c:647
-msgid "close files"
-msgstr "cerrar archivos"
-
-#: src/fileman.c:654
+#: src/fileman.c:524
 msgid "Sign the selected file"
 msgstr "Firmar archivo seleccionado"
 
-#: src/fileman.c:655
-msgid "sign file"
-msgstr "firmar archivo"
-
-#: src/fileman.c:665
+#: src/fileman.c:526
 msgid "Check signatures of selected file"
 msgstr "Comprobar las firmas en el archivo seleccionado"
 
-#: src/fileman.c:666
-msgid "verify file"
-msgstr "verificar archivo"
-
-#: src/fileman.c:676
+#: src/fileman.c:528
 msgid "Encrypt the selected file"
 msgstr "Cifrar el archivo seleccionado"
 
-#: src/fileman.c:677
-msgid "encrypt file"
-msgstr "cifrar archivo"
-
-#: src/fileman.c:687
+#: src/fileman.c:530
 msgid "Decrypt the selected file"
 msgstr "Descifrar el archivo seleccionado"
 
-#: src/fileman.c:688
-msgid "decrypt file"
-msgstr "descifrar archivo"
+#: src/fileman.c:532
+msgid "Close the window"
+msgstr ""
 
-#: src/fileman.c:717 src/keyring.c:1658
-msgid "Open the clipboard"
-msgstr "Abrir el portapapeles"
+#: src/fileman.c:538
+#, fuzzy
+msgid "Select all files"
+msgstr "Cerrar todos los archivos"
 
-#: src/fileman.c:718 src/keyring.c:1659
-msgid "clipboard"
-msgstr "portapapeles"
-
-#: src/fileman.c:826
+#: src/fileman.c:731
 msgid "File"
 msgstr "Archivo"
 
-#: src/fileman.c:891
+#: src/fileman.c:796
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Gestor de Archivos"
 
-#: src/fileman.c:917
+#: src/fileman.c:819
 msgid "File Manager"
 msgstr "Gestor de Archivos"
 
-#: src/fileman.c:993
+#: src/fileman.c:895
 msgid "The file is already open."
 msgstr "El archivo ya estÃ¡ abierto."
 
-#: src/filesigndlg.c:134
+#: src/filesigndlg.c:171
 msgid "Sign documents"
 msgstr "Firmar documentos"
 
-#: src/filesigndlg.c:144
-msgid "Signing Mode"
+#: src/filesigndlg.c:180
+#, fuzzy
+msgid "<b>Sign _as</b>"
+msgstr "<b>Principal</b>"
+
+#: src/filesigndlg.c:201
+#, fuzzy
+msgid "<b>Signing Mode</b>"
 msgstr "Modo de Firma"
 
-#: src/filesigndlg.c:152
-msgid "si_gn and compress"
+#: src/filesigndlg.c:211
+#, fuzzy
+msgid "Si_gn and compress"
 msgstr "fir_mar y comprimir"
 
-#: src/filesigndlg.c:158
-msgid "_cleartext signature"
+#: src/filesigndlg.c:217
+#, fuzzy
+msgid "Clear_text signature"
 msgstr "firma en _claro"
 
-#: src/filesigndlg.c:165
-msgid "_detached signature"
+#: src/filesigndlg.c:223
+#, fuzzy
+msgid "_Detached signature"
 msgstr "firma por _separado"
 
 #: src/gpabackupop.c:208
@@ -571,22 +362,28 @@
 msgstr "Abrir el portapapeles"
 
 #: src/gpa.c:100
-msgid "Start only the UI server (implies --cms)"
+#, fuzzy
+msgid "Open the settings dialog"
+msgstr "Abrir la ventana de preferencias"
+
+#: src/gpa.c:102
+#, fuzzy
+msgid "Enable the UI server (implies --cms)"
 msgstr "Iniciar solo el servicio de interface de usuario (implica --cms)"
 
-#: src/gpa.c:102
+#: src/gpa.c:104
 msgid "Read options from file"
 msgstr "Leer opciones desde un archivo"
 
-#: src/gpa.c:293
+#: src/gpa.c:286
 msgid "[FILE...]"
 msgstr "[ARCHIVO...]"
 
-#: src/gpa.c:295
+#: src/gpa.c:288
 msgid "Graphical frontend to GnuPG"
 msgstr "Interfaz grÃ¡fico a GnuPG"
 
-#: src/gpa.c:296
+#: src/gpa.c:289
 msgid "Please report bugs to <"
 msgstr "Por favor, envÃe informes de error a <"
 
@@ -618,15 +415,15 @@
 "claves pÃºblico (\"%s\").\n"
 "Â¿EstÃ¡ seguro de que quiere distribuir esta clave?"
 
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:455
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:459
 #: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:62 src/settingsdlg.c:165
+#: src/keydeletedlg.c:93 src/keysigndlg.c:61
 msgid "_Yes"
 msgstr "_SÃ"
 
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:456
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:460
 #: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:64 src/settingsdlg.c:168
+#: src/keydeletedlg.c:95 src/keysigndlg.c:63
 msgid "_No"
 msgstr "_No"
 
@@ -638,29 +435,29 @@
 msgid "Decrypting..."
 msgstr "Descifrando..."
 
-#: src/gpafiledecryptop.c:358 src/gpafileverifyop.c:449
+#: src/gpafiledecryptop.c:367 src/gpafileverifyop.c:464
 #, c-format
 msgid "\"%s\" contained no OpenPGP data."
 msgstr "El archivo \"%s\" no contiene datos vÃ¡lidos de OpenPGP."
 
-#: src/gpafiledecryptop.c:359 src/gpafileverifyop.c:450
+#: src/gpafiledecryptop.c:368 src/gpafileverifyop.c:465
 #, c-format
 msgid "The file \"%s\" contained no OpenPGPdata."
 msgstr "El archivo \"%s\" no contiene datos vÃ¡lidos de OpenPGP."
 
-#: src/gpafiledecryptop.c:369
+#: src/gpafiledecryptop.c:378
 #, c-format
 msgid "\"%s\" contained no valid encrypted data."
 msgstr "El archivo \"%s\" no contiene datos cifrados vÃ¡lidos."
 
-#: src/gpafiledecryptop.c:371
+#: src/gpafiledecryptop.c:380
 #, c-format
 msgid "The file \"%s\" contained no validencrypted data."
 msgstr "El archivo \"%s\" no contiene datos cifrados vÃ¡lidos."
 
-#: src/gpafiledecryptop.c:380 src/gpafileencryptop.c:757
-#: src/gpafilesignop.c:511 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
-#: src/gpakeypasswdop.c:197 src/gpakeysignop.c:229
+#: src/gpafiledecryptop.c:389 src/gpafileencryptop.c:751
+#: src/gpafilesignop.c:525 src/gpafileverifyop.c:475 src/gpakeyexpireop.c:240
+#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:237
 msgid "Wrong passphrase!"
 msgstr "Â¡ContraseÃ±a incorrecta!"
 
@@ -668,58 +465,57 @@
 msgid "Encrypting..."
 msgstr "Cifrando..."
 
-#: src/gpafileencryptop.c:453 src/verifydlg.c:222
+#: src/gpafileencryptop.c:457 src/verifydlg.c:222
 msgid "Unknown Key"
 msgstr "Clave Desconocida"
 
-#: src/gpafileencryptop.c:469
+#: src/gpafileencryptop.c:473
 msgid "You are going to encrypt a document using the following key:"
 msgstr "Va a cifrar un documento usando la siguiente clave:"
 
-#: src/gpafileencryptop.c:475
+#: src/gpafileencryptop.c:479
 msgid "However, it is not certain that the key belongs to that person."
 msgstr ""
 "Sin embargo, no existe seguridad de que la clave pertenezca a esa persona"
 
-#: src/gpafileencryptop.c:481
+#: src/gpafileencryptop.c:485
 msgid "Do you <b>really</b> want to use this key?"
 msgstr "Â¿EstÃ¡ <b>seguro</b> de que quiere usar esa clave?"
 
-#: src/gpafileencryptop.c:502 src/gpafileencryptop.c:542 src/verifydlg.c:227
+#: src/gpafileencryptop.c:506 src/gpafileencryptop.c:546 src/verifydlg.c:227
 msgid "Revoked Key"
 msgstr "Clave Revocada"
 
-#: src/gpafileencryptop.c:504 src/gpafileencryptop.c:544 src/gpawizard.c:281
-#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:436
-#: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
+#: src/gpafileencryptop.c:508 src/gpafileencryptop.c:548 src/gtktools.c:52
+#: src/gtktools.c:86 src/keyeditdlg.c:149 src/verifydlg.c:115
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/gpafileencryptop.c:517
+#: src/gpafileencryptop.c:521
 msgid "The following key has been revoked by it's owner:"
 msgstr "Esta clave ha sido revocada por su propietario:"
 
-#: src/gpafileencryptop.c:522 src/gpafileencryptop.c:565
+#: src/gpafileencryptop.c:526 src/gpafileencryptop.c:569
 msgid "And can not be used for encryption."
 msgstr "Y no se puede usar para cifrado."
 
-#: src/gpafileencryptop.c:557
+#: src/gpafileencryptop.c:561
 #, c-format
 msgid "The following key expired on %s:"
 msgstr "Esta clave caducÃ³ el %s:"
 
-#: src/gpafileencryptop.c:596 src/gpafilesignop.c:429
+#: src/gpafileencryptop.c:600 src/gpafilesignop.c:448
 msgid ""
 "The selected certificates are not all of the same type. That is, you mixed "
 "OpenPGP and X.509 certificates. Please make sure to select only certificates "
 "of the same type."
 msgstr ""
 
-#: src/gpafileencryptop.c:671 src/gpafilesignop.c:415
+#: src/gpafileencryptop.c:675 src/gpafilesignop.c:434
 msgid "You didn't select any key for signing"
 msgstr "No se seleccionÃ³ ninguna clave con la que firmar"
 
-#: src/gpafilesignop.c:148
+#: src/gpafilesignop.c:157
 msgid "Signing..."
 msgstr "Firmando..."
 
@@ -747,11 +543,11 @@
 msgid "Import public keys from file"
 msgstr "Importar claves pÃºblicas de fichero"
 
-#: src/gpaimportop.c:197
+#: src/gpaimportop.c:196
 msgid "No keys were found."
 msgstr "No se encontrÃ³ ninguna clave."
 
-#: src/gpaimportop.c:205
+#: src/gpaimportop.c:204
 #, c-format
 msgid ""
 "%i public keys read\n"
@@ -768,7 +564,7 @@
 "%i claves secretas importadas\n"
 "%i claves secretas sin cambios"
 
-#: src/gpakeyexpireop.c:239
+#: src/gpakeyexpireop.c:244
 msgid ""
 "Invalid time given.\n"
 "(you may not set the expiration time to the past.)"
@@ -776,29 +572,29 @@
 "Tiempo no vÃ¡lido.\n"
 "(no puede indicar un tiempo de expiraciÃ³n en el pasado.)"
 
-#: src/gpakeyselector.c:86 src/keylist.c:567 src/siglist.c:94
+#: src/gpakeyselector.c:86 src/keylist.c:555 src/siglist.c:94
 #: src/siglist.c:114 src/verifydlg.c:324
 msgid "Key ID"
 msgstr "ID de Clave"
 
-#: src/gpakeyselector.c:95 src/keylist.c:618 src/siglist.c:100
+#: src/gpakeyselector.c:95 src/keylist.c:606 src/siglist.c:100
 #: src/siglist.c:143 src/verifydlg.c:336
 msgid "User Name"
 msgstr "Nombre de Usuario"
 
-#: src/gpakeysignop.c:188
+#: src/gpakeysignop.c:191
 msgid "No private key for signing."
 msgstr "No hay clave secreta con la que firmar."
 
-#: src/gpakeysignop.c:233
+#: src/gpakeysignop.c:241
 msgid "This key has expired! Unable to sign."
 msgstr "Â¡Esta clave ha caducado! No se puede firmar."
 
-#: src/gpakeysignop.c:237
+#: src/gpakeysignop.c:245
 msgid "This key has already been signed with your own!"
 msgstr "Â¡Esta clave ya ha sido firmada con la suya!"
 
-#: src/gpakeysignop.c:242
+#: src/gpakeysignop.c:250
 msgid "You haven't selected a default key to sign with!"
 msgstr "Â¡No ha seleccionado una clave por defecto con la que firmar!"
 
@@ -826,7 +622,7 @@
 msgid "unknown"
 msgstr "desconocida"
 
-#: src/gparecvkeydlg.c:101
+#: src/gparecvkeydlg.c:106
 msgid "Which key do you want to import? (The key must be specified by key ID)."
 msgstr ""
 "Â¿QuÃ© clave desea importar? (La clave debe especificarse por su ID de clave)."
@@ -851,7 +647,7 @@
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: src/gpasubkeylist.c:97 src/keyeditdlg.c:171 src/keylist.c:580
+#: src/gpasubkeylist.c:97 src/keyeditdlg.c:168 src/keylist.c:568
 msgid "Expiry Date"
 msgstr "Fecha de Caducidad"
 
@@ -871,12 +667,12 @@
 msgid "Can authenticate"
 msgstr "Puede autenticar"
 
-#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:830
-#: src/gpgmetools.c:949
+#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:833
+#: src/gpgmetools.c:952
 msgid "Revoked"
 msgstr "Revocada"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:945
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:948
 msgid "Expired"
 msgstr "Caducada"
 
@@ -888,21 +684,21 @@
 msgid "Unsigned"
 msgstr "Sin firmar"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:936 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:939 src/verifydlg.c:212
 msgid "Valid"
 msgstr "VÃ¡lida"
 
 #: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
-#: src/keyring.c:1176 src/keysigndlg.c:104
+#: src/keyring.c:1248 src/keysigndlg.c:100
 msgid "User Name:"
 msgstr "Nombre de Usuario:"
 
-#: src/gpawidgets.c:72 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/keysigndlg.c:100
 msgid "User Names:"
 msgstr "Nombres de Usuario:"
 
 #: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
-#: src/keyring.c:1178
+#: src/keyring.c:1250
 msgid "Key ID:"
 msgstr "ID de Clave:"
 
@@ -914,15 +710,15 @@
 msgid "_indefinitely valid"
 msgstr "vÃ¡lida _indefinidamente"
 
-#: src/gpawidgets.c:196
+#: src/gpawidgets.c:195
 msgid "expire _after"
 msgstr "caduca _pasado"
 
-#: src/gpawidgets.c:216
+#: src/gpawidgets.c:215
 msgid "expire o_n:"
 msgstr "_caduca el:"
 
-#: src/gpawidgets.c:292 src/keygendlg.c:295
+#: src/gpawidgets.c:289 src/keygendlg.c:291
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -930,19 +726,7 @@
 "Â¡ERROR FATAL!\n"
 "Modo de inserciÃ³n no vÃ¡lido para la fecha de caducidad."
 
-#: src/gpawizard.c:260
-msgid "_Back"
-msgstr "_AtrÃ¡s"
-
-#: src/gpawizard.c:267
-msgid "_Forward"
-msgstr "_Siguiente"
-
-#: src/gpawizard.c:274
-msgid "_Apply"
-msgstr "_Aplicar"
-
-#: src/gpgmetools.c:58
+#: src/gpgmetools.c:59
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -959,7 +743,7 @@
 "\n"
 "Se abortarÃ¡ la aplicaciÃ³n"
 
-#: src/gpgmetools.c:72
+#: src/gpgmetools.c:73
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -1022,7 +806,7 @@
 msgstr "RSA (solo firma)"
 
 #: src/gpgmetools.c:590 src/gpgmetools.c:613 src/gpgmetools.c:630
-#: src/gpgmetools.c:941 src/gpgmetools.c:974
+#: src/gpgmetools.c:944 src/gpgmetools.c:977
 msgid "Unknown"
 msgstr "Desconocida"
 
@@ -1062,53 +846,53 @@
 msgid "Enter Passphrase"
 msgstr "Introduzca ContraseÃ±a"
 
-#: src/gpgmetools.c:823
+#: src/gpgmetools.c:826
 msgid "[None]"
 msgstr "[Ninguno]"
 
-#: src/gpgmetools.c:913 src/verifydlg.c:269
+#: src/gpgmetools.c:916 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[Identificador de usuario, user ID, desconocido]"
 
-#: src/gpgmetools.c:939 src/verifydlg.c:217
+#: src/gpgmetools.c:942 src/verifydlg.c:217
 msgid "Bad"
 msgstr "Incorrecta"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:965
 msgid "Generic"
 msgstr "GenÃ©rica"
 
-#: src/gpgmetools.c:965
+#: src/gpgmetools.c:968
 msgid "Persona"
 msgstr "Persona"
 
-#: src/gpgmetools.c:968
+#: src/gpgmetools.c:971
 msgid "Casual"
 msgstr "Casual"
 
-#: src/gpgmetools.c:971
+#: src/gpgmetools.c:974
 msgid "Positive"
 msgstr "Positiva"
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:992
 msgid "The key can be used for certification, signing and encryption."
 msgstr "Esta clave puede utilizarse para certificaciÃ³n, firma y cifrado."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:995
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "Esta clave puede utilizarse para certificaciÃ³n y firma, pero no para cifrado."
 
-#: src/gpgmetools.c:998
+#: src/gpgmetools.c:1001
 msgid "The key can be used for certification and encryption."
 msgstr "Esta clave puede utilizarse para certificaciÃ³n y cifrado."
 
-#: src/gpgmetools.c:1001
+#: src/gpgmetools.c:1004
 msgid "The key can be used only for certification."
 msgstr "Esta clave puede utilizarse sÃ³lo para certificaciÃ³n."
 
-#: src/gpgmetools.c:1009
+#: src/gpgmetools.c:1012
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -1116,78 +900,71 @@
 "Esta clave puede utilizarse sÃ³lo para firma y cifrado, pero no para\n"
 "certificaciÃ³n."
 
-#: src/gpgmetools.c:1012
+#: src/gpgmetools.c:1015
 msgid "The key can be used only for signing."
 msgstr "Esta clave puede utilizarse tan sÃ³lo para firma."
 
-#: src/gpgmetools.c:1017
+#: src/gpgmetools.c:1020
 msgid "The key can be used only for encryption."
 msgstr "Esta clave puede utilizarse tan sÃ³lo para cifrado."
 
-#: src/gpgmetools.c:1020
+#: src/gpgmetools.c:1023
 msgid "This key is useless."
 msgstr "Esta clave no vale para nada."
 
-#: src/gtktools.c:320
+#: src/gtktools.c:48
 msgid "GPA Error"
 msgstr "Error de GPA"
 
-#: src/helpmenu.c:216
+#: src/helpmenu.c:83
 msgid "About GPA"
 msgstr "Acerca de GPA"
 
-#: src/helpmenu.c:261
-msgid "Brought to you by:"
-msgstr "De la mano de:"
+#: src/helpmenu.c:89
+#, fuzzy
+msgid "GPA is the GNU Privacy Assistant."
+msgstr "Comprendiendo el GNU Privacy Assistant"
 
-#: src/helpmenu.c:298
-msgid "GPA is Free Software under the"
-msgstr "GPA es Software Libre bajo la"
+#: src/icons.c:199
+#, fuzzy
+msgid "_Verify"
+msgstr "Verificar"
 
-#: src/helpmenu.c:302
-msgid "GNU General Public License."
-msgstr "GNU General Public License,"
+#: src/icons.c:200
+#, fuzzy
+msgid "_Encrypt"
+msgstr "Cifrar"
 
-#: src/helpmenu.c:306
-msgid "For news see:"
-msgstr "Noticias en:"
+#: src/icons.c:201
+#, fuzzy
+msgid "_Decrypt"
+msgstr "Descifrar"
 
-#: src/helpmenu.c:311
-msgid "http://www.gpg4win.org"
-msgstr "http://www.gpg4win.org"
+#: src/icons.c:202
+#, fuzzy
+msgid "_Brief"
+msgstr "Breve"
 
-#: src/helpmenu.c:313
-msgid "http://www.gnupg.org"
-msgstr "http://www.gnupg.org"
+#: src/icons.c:203
+#, fuzzy
+msgid "_Detailed"
+msgstr "Detallada"
 
-#: src/helpmenu.c:396
-msgid "GNU General Public License"
-msgstr "GNU General Public License"
+#: src/icons.c:204
+#, fuzzy
+msgid "_Keyring Editor"
+msgstr "Editor del Anillo"
 
-#: src/helpmenu.c:423
-msgid "_GNU General Public License"
-msgstr "_GNU General Public License"
+#: src/icons.c:205
+#, fuzzy
+msgid "_Clipboard"
+msgstr "Portapapeles"
 
-#: src/helpmenu.c:450
-msgid "Show Help Text\n"
-msgstr "Mostrar texto de ayuda\n"
+#: src/icons.c:206
+#, fuzzy
+msgid "_File Manager"
+msgstr "Gestor de Archivos"
 
-#: src/helpmenu.c:458
-msgid "/_Help"
-msgstr "/A_yuda"
-
-#: src/helpmenu.c:460
-msgid "/Help/_Contents"
-msgstr "/Ayuda/_Contenidos"
-
-#: src/helpmenu.c:463
-msgid "/Help/_License"
-msgstr "/Ayuda/_Licencia"
-
-#: src/helpmenu.c:464
-msgid "/Help/_About"
-msgstr "/Ayuda/Acerca de..."
-
 #: src/keydeletedlg.c:41
 msgid "Removing Secret Key"
 msgstr "Borrar Clave Secreta"
@@ -1234,23 +1011,28 @@
 msgid "Are you sure you want to delete this key?"
 msgstr "Seguro que desea borrar esta clave?"
 
-#: src/keyeditdlg.c:149
+#: src/keyeditdlg.c:147
 msgid "Edit Key"
 msgstr "Editar Clave"
 
-#: src/keyeditdlg.c:165
+#: src/keyeditdlg.c:162
 msgid "Change _passphrase"
 msgstr "Cambiar contra_seÃ±a"
 
-#: src/keyeditdlg.c:185
+#: src/keyeditdlg.c:182
 msgid "Change _expiration"
 msgstr "Cambiar ca_ducidad"
 
-#: src/keygendlg.c:58
+#: src/keygendlg.c:67
+#, fuzzy
+msgid "You must enter a key size."
+msgstr "Tienes que introducir un Identificador de Usuario (User ID)"
+
+#: src/keygendlg.c:72
 msgid "You must enter a User ID."
 msgstr "Tienes que introducir un Identificador de Usuario (User ID)"
 
-#: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
+#: src/keygendlg.c:77 src/passwddlg.c:45
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -1258,7 +1040,7 @@
 "En \"ContraseÃ±a\" y \"Repetir contraseÃ±a\",\n"
 "debe introducir la misma contraseÃ±a."
 
-#: src/keygendlg.c:70 src/keygenwizard.c:314 src/passwddlg.c:52
+#: src/keygendlg.c:84 src/passwddlg.c:52
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1266,7 +1048,7 @@
 "No introdujo ninguna contraseÃ±a.\n"
 "Es necesaria para proteger su clave secreta."
 
-#: src/keygendlg.c:83 src/keygenwizard.c:328 src/passwddlg.c:65
+#: src/keygendlg.c:97 src/passwddlg.c:65
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1278,23 +1060,25 @@
 "\n"
 "Por favor introduzca una nueva contraseÃ±a."
 
-#: src/keygendlg.c:88 src/keygenwizard.c:333 src/passwddlg.c:70
+#: src/keygendlg.c:102 src/passwddlg.c:70
 msgid "_Enter new passphrase"
 msgstr "_Introducir nueva contraseÃ±a"
 
-#: src/keygendlg.c:89 src/keygenwizard.c:334 src/passwddlg.c:71
+#: src/keygendlg.c:104 src/passwddlg.c:71
 msgid "Take this one _anyway"
 msgstr "_Usar esta de todas formas"
 
-#: src/keygendlg.c:144 src/keygenwizard.c:541
+#: src/keygendlg.c:150 src/keygenwizard.c:571 src/keygenwizard.c:584
+#: src/keygenwizard.c:594 src/keygenwizard.c:604 src/keygenwizard.c:616
+#: src/keygenwizard.c:633 src/keygenwizard.c:645
 msgid "Generate key"
 msgstr "Generar clave"
 
-#: src/keygendlg.c:185
+#: src/keygendlg.c:177
 msgid "_Algorithm: "
 msgstr "A_lgoritmo: "
 
-#: src/keygendlg.c:197
+#: src/keygendlg.c:192
 msgid "_Key size (bits): "
 msgstr "_TamaÃ±o de la clave (bits): "
 
@@ -1310,27 +1094,27 @@
 msgid "2048"
 msgstr "2048"
 
-#: src/keygendlg.c:216
+#: src/keygendlg.c:206
 msgid "_User ID: "
 msgstr "Nombre de _Usuario: "
 
-#: src/keygendlg.c:226
+#: src/keygendlg.c:217
 msgid "_Email: "
 msgstr "Co_rreo ElectrÃ³nico"
 
-#: src/keygendlg.c:236
+#: src/keygendlg.c:226
 msgid "_Comment: "
 msgstr "Co_mentario: "
 
-#: src/keygendlg.c:248
+#: src/keygendlg.c:235
 msgid "_Passphrase: "
 msgstr "Contra_seÃ±a: "
 
-#: src/keygendlg.c:260
+#: src/keygendlg.c:246
 msgid "_Repeat passphrase: "
 msgstr "Re_petir contraseÃ±a: "
 
-#: src/keygenwizard.c:152
+#: src/keygenwizard.c:172
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1342,19 +1126,16 @@
 "Su nombre serÃ¡ parte de la nueva clave, esto facilitarÃ¡ la identificaciÃ³n de "
 "su clave a otras personas."
 
-#: src/keygenwizard.c:157
+#: src/keygenwizard.c:175
 msgid "Your Name:"
 msgstr "Su Nombre:"
 
-#: src/keygenwizard.c:170
-msgid "Please insert your name"
-msgstr "Por favor, introduzca su nombre"
-
-#: src/keygenwizard.c:183
+#: src/keygenwizard.c:211
+#, fuzzy
 msgid ""
 "Please insert your email address.\n"
 "\n"
-" Your email address will be part of the new key to make it easier for others "
+"Your email address will be part of the new key to make it easier for others "
 "to identify keys. If you have several email addresses, you can add further "
 "email adresses later."
 msgstr ""
@@ -1364,27 +1145,40 @@
 "su clave a otras personas. Si tiene varias direcciones, puede aÃ±adir otras "
 "mÃ¡s tarde."
 
-#: src/keygenwizard.c:190
+#: src/keygenwizard.c:215
 msgid "Your Email Address:"
 msgstr "Su direcciÃ³n de correo electrÃ³nico"
 
-#: src/keygenwizard.c:205
-msgid "Please insert your email address"
-msgstr "Por favor introduzca su direcciÃ³n de correo electrÃ³nico"
-
-#: src/keygenwizard.c:239
+#: src/keygenwizard.c:319
 msgid "Please choose a passphrase for the new key."
 msgstr "Por favor, escoja una contraseÃ±a para la nueva clave."
 
-#: src/keygenwizard.c:248 src/passwddlg.c:108
+#: src/keygenwizard.c:326
+#, fuzzy
+msgid ""
+"In \"Passphrase\" and \"Repeat passphrase\", you must enter the same "
+"passphrase."
+msgstr ""
+"En \"ContraseÃ±a\" y \"Repetir contraseÃ±a\",\n"
+"debe introducir la misma contraseÃ±a."
+
+#: src/keygenwizard.c:335
+msgid "Warning: The passphrase you have entered is not very secure."
+msgstr ""
+
+#: src/keygenwizard.c:350
+msgid "Quality: "
+msgstr ""
+
+#: src/keygenwizard.c:358 src/passwddlg.c:111
 msgid "Passphrase: "
 msgstr "ContraseÃ±a: "
 
-#: src/keygenwizard.c:261 src/passwddlg.c:117
+#: src/keygenwizard.c:370 src/passwddlg.c:120
 msgid "Repeat Passphrase: "
 msgstr "Repetir contraseÃ±a: "
 
-#: src/keygenwizard.c:358
+#: src/keygenwizard.c:412
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1396,15 +1190,15 @@
 "\n"
 "Â¿Quiere crear una copia de seguridad ahora?"
 
-#: src/keygenwizard.c:367
+#: src/keygenwizard.c:420
 msgid "Create _backup copy"
 msgstr "Crear copia de _seguridad"
 
-#: src/keygenwizard.c:374 src/keyring.c:739 src/keyring.c:767
+#: src/keygenwizard.c:425 src/keyring.c:737 src/keyring.c:763
 msgid "Do it _later"
 msgstr "Hacerlo mÃ¡s _tarde"
 
-#: src/keygenwizard.c:402
+#: src/keygenwizard.c:454
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1415,7 +1209,7 @@
 "Incluso en un ordenador rÃ¡pido esto podrÃa llevar tiempo. Por favor, sea "
 "paciente."
 
-#: src/keygenwizard.c:411
+#: src/keygenwizard.c:463
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1435,28 +1229,28 @@
 "GnuPG estÃ¡ reconstruyendo la base de datos de confianza\n"
 "Esto podrÃa llevar unos segundos."
 
-#: src/keylist.c:559
+#: src/keylist.c:547
 msgid ""
 "This columns lists the type of the certificate.  A 'P' denotes OpenPGP and a "
 "'X' denotes X.509 (S/MIME)."
 msgstr ""
 
-#: src/keylist.c:568
+#: src/keylist.c:556
 msgid "The key ID is a short number to identify a certificate."
 msgstr ""
 "El identificador de clave (key ID) es un nÃºmero corto para identificar el "
 "certificado."
 
-#: src/keylist.c:581
+#: src/keylist.c:569
 msgid "The Expiry Date is the date until the certificate is valid."
 msgstr ""
 "La Fecha de Caducidad es la fecha hasta la cual el certificado es vÃ¡lido."
 
-#: src/keylist.c:591 src/ownertrustdlg.c:122
+#: src/keylist.c:579 src/ownertrustdlg.c:123
 msgid "Owner Trust"
 msgstr "Confianza en el Usuario"
 
-#: src/keylist.c:592
+#: src/keylist.c:580
 msgid ""
 "The Owner Trust has been set by you and describes how far you trust the "
 "holder of the certificate to correctly sign (certify) other certificates.  "
@@ -1466,11 +1260,11 @@
 "describe si confias en dueÃ±o del certificado para firmar otros certificados. "
 "Esta opciÃ³n solo tiene funcionalidad para OpenPGP."
 
-#: src/keylist.c:604
+#: src/keylist.c:592
 msgid "Validity"
 msgstr "Validez"
 
-#: src/keylist.c:605
+#: src/keylist.c:593
 msgid ""
 "The Validity describes the trust level the system has in this certificate.  "
 "That is how sure it is that the named user is actually that user."
@@ -1479,7 +1273,7 @@
 "certificado. La Valided permite medir la certeza de que el nombre de usuario "
 "es realmente el usuario."
 
-#: src/keylist.c:619
+#: src/keylist.c:607
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
@@ -1491,7 +1285,7 @@
 msgid "No keys selected for signing."
 msgstr "No hay ninguna clave seleccionada para firmar."
 
-#: src/keyring.c:734
+#: src/keyring.c:732
 msgid ""
 "You do not have a private key yet. Do you want to generate one now "
 "(recommended) or do it later?"
@@ -1499,11 +1293,11 @@
 "AÃºn no tiene una clave privada. Â¿Quiere generar una ahora (recomendado) o "
 "hacerlo mÃ¡s tarde?"
 
-#: src/keyring.c:738
+#: src/keyring.c:736
 msgid "_Generate key now"
 msgstr "_Generar clave ahora"
 
-#: src/keyring.c:761
+#: src/keyring.c:757
 msgid ""
 "You do not have a backup copy of your private key yet. Do you want to backup "
 "your key now (recommended) or do it later?"
@@ -1511,335 +1305,244 @@
 "No ha hecho aÃºn una copia de seguridad de su clave privada. Â¿Desea hacer una "
 "copia de seguridad ahora (recomendado), o mÃ¡s tarde?"
 
-#: src/keyring.c:766
+#: src/keyring.c:762
 msgid "_Backup key now"
 msgstr "Hacer _copia de seguridad ahora"
 
-#: src/keyring.c:883
-msgid "/_Keys"
+#: src/keyring.c:886
+#, fuzzy
+msgid "_Keys"
 msgstr "/_Claves"
 
-#: src/keyring.c:884
-msgid "/Keys/_Refresh"
-msgstr "/Claves/_Actualizar"
-
-#: src/keyring.c:886
-msgid "/Keys/sep0"
-msgstr "/Claves/sep0"
-
 #: src/keyring.c:887
-msgid "/Keys/_New Key..."
-msgstr "/Claves/_Nueva Clave..."
+#, fuzzy
+msgid "_Server"
+msgstr "/_Servidor"
 
-#: src/keyring.c:889
-msgid "/Keys/_Delete Keys..."
-msgstr "/Claves/_Borrar Claves..."
+#: src/keyring.c:901
+msgid "Select all certificates"
+msgstr ""
 
-#: src/keyring.c:891
-msgid "/Keys/sep1"
-msgstr "/Claves/sep1"
+#: src/keyring.c:906
+msgid "Refresh the keyring"
+msgstr "Actualizar el anillo de llaves"
 
-#: src/keyring.c:892
-msgid "/Keys/_Sign Keys..."
-msgstr "/Claves/_Firmar Claves..."
+#: src/keyring.c:907
+#, fuzzy
+msgid "_New key..."
+msgstr "/Claves/_Nueva Clave..."
 
-#: src/keyring.c:893
-msgid "/Keys/Set _Owner Trust..."
-msgstr "/Claves/Establecer _Confianza en el Usuario..."
+#: src/keyring.c:908
+#, fuzzy
+msgid "Generate a new key"
+msgstr "Generar clave"
 
-#: src/keyring.c:894
-msgid "/Keys/_Edit Private Key..."
-msgstr "/Claves/_Editar Clave Privada..."
+#: src/keyring.c:909
+#, fuzzy
+msgid "_Delete keys"
+msgstr "/_Borrar Claves..."
 
-#: src/keyring.c:895
-msgid "/Keys/sep2"
-msgstr "/Claves/sep2"
+#: src/keyring.c:910
+msgid "Remove the selected key"
+msgstr "Borrar la clave seleccionada"
 
-#: src/keyring.c:896
-msgid "/Keys/_Import Keys..."
-msgstr "/Claves/_Importar Claves..."
+#: src/keyring.c:911
+#, fuzzy
+msgid "_Sign Keys..."
+msgstr "/_Firmar Claves..."
 
-#: src/keyring.c:897
-msgid "/Keys/E_xport Keys..."
-msgstr "/Claves/E_xportar Claves..."
+#: src/keyring.c:912
+msgid "Sign the selected key"
+msgstr "Firmar la clave seleccionada"
 
-#: src/keyring.c:898
-msgid "/Keys/_Backup..."
-msgstr "/Claves/_Copia de Seguridad..."
+#: src/keyring.c:913
+#, fuzzy
+msgid "Set _Owner Trust..."
+msgstr "/Establecer _Confianza en el Usuario..."
 
-#: src/keyring.c:901
-msgid "/_Server"
-msgstr "/_Servidor"
+#: src/keyring.c:914
+#, fuzzy
+msgid "Set owner trust of the selected key"
+msgstr "Borrar la clave seleccionada"
 
-#: src/keyring.c:902
-msgid "/Server/_Retrieve Keys..."
-msgstr "/Servidor/_Descargar Claves..."
+#: src/keyring.c:916
+#, fuzzy
+msgid "_Edit Private Key..."
+msgstr "/_Editar Clave Privada..."
 
-#: src/keyring.c:903
-msgid "/Server/_Send Keys..."
-msgstr "/Servidor/_Enviar Claves..."
+#: src/keyring.c:917
+msgid "Edit the selected private key"
+msgstr "Editar la clave privada seleccionada"
 
-#: src/keyring.c:908
-msgid "/Windows/_File Manager"
-msgstr "/Ventanas/Gestor de _Archivos"
+#: src/keyring.c:919
+#, fuzzy
+msgid "_Import Keys..."
+msgstr "Importar Claves"
 
-#: src/keyring.c:939
-msgid "/Keys/Export Keys..."
-msgstr "/Claves/Exportar Claves..."
+#: src/keyring.c:920
+msgid "Import Keys"
+msgstr "Importar Claves"
 
-#: src/keyring.c:944
-msgid "/Keys/Delete Keys..."
-msgstr "/Claves/Borrar Claves..."
+#: src/keyring.c:921
+#, fuzzy
+msgid "E_xport Keys..."
+msgstr "/E_xportar Claves..."
 
-#: src/keyring.c:952
-msgid "/Server/Send Keys..."
-msgstr "/Servidor/Enviar Claves..."
+#: src/keyring.c:922
+msgid "Export Keys"
+msgstr "Exportar Claves"
 
-#: src/keyring.c:959
-msgid "/Keys/Set Owner Trust..."
-msgstr "/Claves/Establecer Confianza en el Usuario..."
+#: src/keyring.c:923
+#, fuzzy
+msgid "_Backup..."
+msgstr "/_Copia de Seguridad..."
 
-#: src/keyring.c:966
-msgid "/Keys/Sign Keys..."
-msgstr "/Claves/Firmar Claves..."
+#: src/keyring.c:924
+#, fuzzy
+msgid "Backup key"
+msgstr "Hacer _copia de seguridad ahora"
 
-#: src/keyring.c:972
-msgid "/Keys/Edit Private Key..."
-msgstr "/Claves/Editar Clave Privada..."
+#: src/keyring.c:927
+#, fuzzy
+msgid "_Retrieve Keys..."
+msgstr "/Servidor/_Descargar Claves..."
 
-#: src/keyring.c:977
-msgid "/Keys/Backup..."
-msgstr "/Claves/Copia de Seguridad..."
+#: src/keyring.c:928
+msgid "Retrieve keys from server"
+msgstr ""
 
-#: src/keyring.c:994
-msgid "/_Copy"
-msgstr "/_Copiar"
-
-#: src/keyring.c:996
-msgid "/_Paste"
-msgstr "/_Pegar"
-
-#: src/keyring.c:998
-msgid "/_Delete Keys..."
-msgstr "/_Borrar Claves..."
-
-#: src/keyring.c:1001
-msgid "/_Sign Keys..."
+#: src/keyring.c:930
+#, fuzzy
+msgid "_Send Keys..."
 msgstr "/_Firmar Claves..."
 
-#: src/keyring.c:1002
-msgid "/Set _Owner Trust..."
-msgstr "/Establecer _Confianza en el Usuario..."
+#: src/keyring.c:931
+#, fuzzy
+msgid "Send keys to server"
+msgstr "E_nviar claves al servidor"
 
-#: src/keyring.c:1003
-msgid "/_Edit Private Key..."
-msgstr "/_Editar Clave Privada..."
+#: src/keyring.c:937
+msgid "Show Brief Keylist"
+msgstr "Mostrar Lista de Claves Breve"
 
-#: src/keyring.c:1005
-msgid "/E_xport Keys..."
-msgstr "/E_xportar Claves..."
+#: src/keyring.c:939
+msgid "Show Key Details"
+msgstr "Mostrar detalles de las claves"
 
-#: src/keyring.c:1006
-msgid "/Se_nd Keys to Server..."
-msgstr "E_nviar claves al servidor"
+#: src/keyring.c:1063
+msgid "Edit"
+msgstr "Editar"
 
-#: src/keyring.c:1007
-msgid "/_Backup..."
-msgstr "/_Copia de Seguridad..."
+#: src/keyring.c:1065
+#, fuzzy
+msgid "Delete"
+msgstr "/Editar/Eliminar"
 
-#: src/keyring.c:1018
-msgid "/Set Owner Trust..."
-msgstr "/Establecer Confianza en el Usuario..."
+#: src/keyring.c:1067
+msgid "Sign"
+msgstr "Firmar"
 
-#: src/keyring.c:1025
-msgid "/Sign Keys..."
-msgstr "/Firmar Claves..."
+#: src/keyring.c:1069
+msgid "Export"
+msgstr "Exportar"
 
-#: src/keyring.c:1031
-msgid "/Edit Private Key..."
-msgstr "/Editar Clave Privada..."
+#: src/keyring.c:1071
+msgid "Import"
+msgstr "Importar"
 
-#: src/keyring.c:1036
-msgid "/Backup..."
-msgstr "/Copia de Seguridad..."
-
-#: src/keyring.c:1106
+#: src/keyring.c:1178
 msgid "Subkeys"
 msgstr "Subclaves"
 
-#: src/keyring.c:1180 src/keysigndlg.c:110
+#: src/keyring.c:1252 src/keysigndlg.c:106
 msgid "Fingerprint:"
 msgstr "Huella dactilar:"
 
-#: src/keyring.c:1182
+#: src/keyring.c:1254
 msgid "Expires at:"
 msgstr "Caduca el:"
 
-#: src/keyring.c:1184
+#: src/keyring.c:1256
 msgid "Owner Trust:"
 msgstr "Confianza en el usuario:"
 
-#: src/keyring.c:1186
+#: src/keyring.c:1258
 msgid "Key Validity:"
 msgstr "Validez de la Clave:"
 
-#: src/keyring.c:1188
+#: src/keyring.c:1260
 msgid "Key Type:"
 msgstr "Tipo de Clave:"
 
-#: src/keyring.c:1190
+#: src/keyring.c:1262
 msgid "Created at:"
 msgstr "Creada el:"
 
-#: src/keyring.c:1193
+#: src/keyring.c:1265
 msgid "Details"
 msgstr "Detalles"
 
-#: src/keyring.c:1201
+#: src/keyring.c:1273
 msgid "Show signatures on user name:"
 msgstr "Mostrar firmas en el nombre de usuario:"
 
-#: src/keyring.c:1225
+#: src/keyring.c:1298
 msgid "Signatures"
 msgstr "Firmas"
 
-#: src/keyring.c:1249
+#: src/keyring.c:1322
 msgid "The key has both a private and a public part"
 msgstr "Esta clave tiene tanto una parte secreta como una pÃºblica"
 
-#: src/keyring.c:1252
+#: src/keyring.c:1325
 msgid "The key has only a public part"
 msgstr "Esta clave solo tiene una parte pÃºblica"
 
-#: src/keyring.c:1287
+#: src/keyring.c:1360
 #, c-format
 msgid "%s %u bits"
 msgstr "%s %u bits"
 
-#: src/keyring.c:1312
+#: src/keyring.c:1385
 msgid "No keys selected"
 msgstr "No hay claves seleccionadas"
 
-#: src/keyring.c:1315
+#: src/keyring.c:1388
 #, c-format
 msgid "%d key selected"
 msgid_plural "%d keys selected"
 msgstr[0] "%d clave seleccionada"
 msgstr[1] "%d claves seleccionadas"
 
-#: src/keyring.c:1347
+#: src/keyring.c:1423
 msgid "All signatures"
 msgstr "Todas las firmas"
 
-#: src/keyring.c:1552
-msgid "Edit"
-msgstr "Editar"
-
-#: src/keyring.c:1553
-msgid "Edit the selected private key"
-msgstr "Editar la clave privada seleccionada"
-
-#: src/keyring.c:1554
-msgid "edit key"
-msgstr "editar clave"
-
-#: src/keyring.c:1562
-msgid "Remove the selected key"
-msgstr "Borrar la clave seleccionada"
-
-#: src/keyring.c:1563
-msgid "remove key"
-msgstr "borrar clave"
-
-#: src/keyring.c:1571
-msgid "Sign the selected key"
-msgstr "Firmar la clave seleccionada"
-
-#: src/keyring.c:1571
-msgid "sign key"
-msgstr "firmar clave"
-
 #: src/keyring.c:1578
-msgid "Import"
-msgstr "Importar"
-
-#: src/keyring.c:1579
-msgid "Import Keys"
-msgstr "Importar Claves"
-
-#: src/keyring.c:1579
-msgid "import keys"
-msgstr "importar claves"
-
-#: src/keyring.c:1584
-msgid "Export"
-msgstr "Exportar"
-
-#: src/keyring.c:1585
-msgid "Export Keys"
-msgstr "Exportar Claves"
-
-#: src/keyring.c:1585
-msgid "export keys"
-msgstr "exportar claves"
-
-#: src/keyring.c:1598
-msgid "Brief"
-msgstr "Breve"
-
-#: src/keyring.c:1598
-msgid "Show Brief Keylist"
-msgstr "Mostrar Lista de Claves Breve"
-
-#: src/keyring.c:1599
-msgid "brief"
-msgstr "breve"
-
-#: src/keyring.c:1610
-msgid "Detailed"
-msgstr "Detallada"
-
-#: src/keyring.c:1610
-msgid "Show Key Details"
-msgstr "Mostrar detalles de las claves"
-
-#: src/keyring.c:1611
-msgid "detailed"
-msgstr "detallada"
-
-#: src/keyring.c:1639
-msgid "Refresh the keyring"
-msgstr "Actualizar el anillo de llaves"
-
-#: src/keyring.c:1640
-msgid "refresh keyring"
-msgstr "actualizar el anillo de llaves"
-
-#: src/keyring.c:1711
 msgid "Selected default key:"
 msgstr "Clave por defecto seleccionada:"
 
-#: src/keyring.c:1721
+#: src/keyring.c:1588
 msgid "No default key selected in the preferences."
 msgstr "No hay ninguna clave predeterminada seleccionada en preferencias."
 
-#: src/keyring.c:1833
+#: src/keyring.c:1701
 msgid "GNU Privacy Assistant - Keyring Editor"
 msgstr "GNU Privacy Assistant - Editor del Anillo"
 
-#: src/keyring.c:1865
+#: src/keyring.c:1728
 msgid "Keyring Editor"
 msgstr "Editor del Anillo"
 
-#: src/keysigndlg.c:60
+#: src/keysigndlg.c:59
 msgid "Sign Key"
 msgstr "Firmar Clave"
 
-#: src/keysigndlg.c:76
+#: src/keysigndlg.c:72
 msgid "Do you want to sign the following key?"
 msgstr "Â¿Quiere firmar la siguiente clave?"
 
-#: src/keysigndlg.c:120
+#: src/keysigndlg.c:116
 msgid ""
 "Check the name and fingerprint carefully to be sure that it really is the "
 "key you want to sign."
@@ -1847,19 +1550,19 @@
 "Comprueba el nombre y huella dactilar cuidadosamente para estar seguro de "
 "que esta es la clave que desea firmar."
 
-#: src/keysigndlg.c:128
+#: src/keysigndlg.c:124
 msgid "All user names in this key will be signed."
 msgstr "Se firmarÃ¡n todos los nombres de usuario en esta clave."
 
-#: src/keysigndlg.c:134
+#: src/keysigndlg.c:130
 msgid "The key will be signed with your default private key."
 msgstr "Esta clave se firmarÃ¡ con su clave privada por defecto."
 
-#: src/keysigndlg.c:141
+#: src/keysigndlg.c:137
 msgid "Sign only _locally"
 msgstr "Firmar solo _localmente"
 
-#: src/options.c:312
+#: src/options.c:323
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -1867,26 +1570,26 @@
 "La clave privada seleccionada como clave por defecto ya no estÃ¡ disponible.\n"
 "GPA intentarÃ¡ elegir una nueva clave por defecto automÃ¡ticamente."
 
-#: src/ownertrustdlg.c:106
+#: src/ownertrustdlg.c:107
 msgid "Change key ownertrust"
 msgstr "Cambiar confianza en el usuario"
 
-#: src/ownertrustdlg.c:130
+#: src/ownertrustdlg.c:131
 msgid "_Unknown"
 msgstr "_Desconocida"
 
-#: src/ownertrustdlg.c:135
+#: src/ownertrustdlg.c:136
 msgid ""
 "You don't know how much to trust this user to verify other people's keys.\n"
 msgstr ""
 "No sabe cuanto confÃa en el usuario para verificar las claves de otras "
 "personas.\n"
 
-#: src/ownertrustdlg.c:145
+#: src/ownertrustdlg.c:146
 msgid "_Never"
 msgstr "_Nunca"
 
-#: src/ownertrustdlg.c:150
+#: src/ownertrustdlg.c:151
 msgid ""
 "You don't trust this user at all to verify the validity of other people's "
 "keys at all.\n"
@@ -1894,11 +1597,11 @@
 "No confÃa en absoluto en este usuario para verificar la validez de las "
 "claves de otras personas.\n"
 
-#: src/ownertrustdlg.c:160
+#: src/ownertrustdlg.c:161
 msgid "_Marginal"
 msgstr "_Parcial"
 
-#: src/ownertrustdlg.c:165
+#: src/ownertrustdlg.c:166
 msgid ""
 "You don't trust this user's ability to verify the validity of other people's "
 "keys enough to consider keys valid based on his/her sole word.\n"
@@ -1914,11 +1617,11 @@
 "otros dos usuarios en los que confÃe parcialmente y que tengan claves "
 "vÃ¡lidas.\n"
 
-#: src/ownertrustdlg.c:182
+#: src/ownertrustdlg.c:183
 msgid "_Full"
 msgstr "_Total"
 
-#: src/ownertrustdlg.c:187
+#: src/ownertrustdlg.c:188
 msgid ""
 "You trust this user's ability to verify the validity of other people's keys "
 "so much, that you'll consider valid any key signed by him/her, provided this "
@@ -1929,11 +1632,11 @@
 "vÃ¡lida cualquier clave firmada por Ã©l/ella, suponiendo que su clave sea "
 "vÃ¡lida.\n"
 
-#: src/ownertrustdlg.c:200
+#: src/ownertrustdlg.c:201
 msgid "U_ltimate"
 msgstr "_Absoluta"
 
-#: src/ownertrustdlg.c:205
+#: src/ownertrustdlg.c:206
 msgid ""
 "You consider this key valid, and trust the user so much that you will "
 "consider any key signed by him/her fully valid.\n"
@@ -2023,34 +1726,145 @@
 "No hay plugin disponible para el protocolo de servidor\n"
 "de claves que especificÃ³."
 
-#: src/server_access.c:528 src/server_access.c:574
+#: src/server_access.c:528 src/server_access.c:572
 msgid "The keyserver you specified is not valid"
 msgstr "El servidor de claves que especificÃ³ no es vÃ¡lido"
 
-#: src/settingsdlg.c:59
+#: src/settingsdlg.c:133 src/siglist.c:135
+msgid "Local"
+msgstr "Local"
+
+#: src/settingsdlg.c:134
+msgid "Local, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:135
+#, fuzzy
+msgid "Local, PKA"
+msgstr "Local"
+
+#: src/settingsdlg.c:136
+msgid "Local, PKA, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:137
+msgid "Local, Keyserver, PKA"
+msgstr ""
+
+#: src/settingsdlg.c:138
+#, fuzzy
+msgid "Local, kDNS"
+msgstr "Local"
+
+#: src/settingsdlg.c:139
+msgid "Local, kDNS, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:140
+msgid "PKA"
+msgstr ""
+
+#: src/settingsdlg.c:141
+msgid "kDNS"
+msgstr ""
+
+#: src/settingsdlg.c:142
+msgid "Custom"
+msgstr ""
+
+#: src/settingsdlg.c:208
+#, fuzzy
+msgid "<b>User interface</b>"
+msgstr "<b>Usar modo _avanzado</b>"
+
+#: src/settingsdlg.c:215
+#, fuzzy
+msgid "Use _advanced mode"
+msgstr "<b>Usar modo _avanzado</b>"
+
+#: src/settingsdlg.c:221
+msgid "Show advanced _options"
+msgstr ""
+
+#: src/settingsdlg.c:272
+msgid ""
+"No default key has been selected.  This may lead to problems when signing or "
+"encrypting.  For example you might later not be able to read a mail written "
+"by you and encrypted to someone else.\n"
+"\n"
+"Please consider creating your own key and select it then."
+msgstr ""
+
+#: src/settingsdlg.c:278
+msgid "Continue without a default key"
+msgstr ""
+
+#: src/settingsdlg.c:280
+#, fuzzy
+msgid "Let me select a default key"
+msgstr "Clave por defecto seleccionada:"
+
+#: src/settingsdlg.c:305
 msgid "<b>Default _key</b>"
 msgstr "<b>Clave por _defecto</b>"
 
-#: src/settingsdlg.c:111
+#: src/settingsdlg.c:405
 msgid "<b>Default key_server</b>"
 msgstr "<b>Servidor de _claves por defecto</b>"
 
-#: src/settingsdlg.c:158
-msgid "<b>Use _advanced mode</b>"
-msgstr "<b>Usar modo _avanzado</b>"
+#: src/settingsdlg.c:602
+#, fuzzy
+msgid "<b>Auto key _locate</b>"
+msgstr "<b>Servidor de _claves por defecto</b>"
 
-#: src/settingsdlg.c:193
-msgid "Settings"
-msgstr "Preferencias"
+#: src/settingsdlg.c:612
+msgid ""
+"The list of methods to locate keys via an email address.\n"
+"All given methods are used in turn until a matching key is found.  The "
+"supported methods are:\n"
+" Local\n"
+"   - Use the local keyring.\n"
+" Keyserver\n"
+"   - Use the default keyserver.\n"
+" PKA\n"
+"   - Use the Public Key Association.\n"
+" kDNS\n"
+"   - Use kDNS with the nameserver below.\n"
+" Custom\n"
+"   - Configured in the backend dialog.\n"
+msgstr ""
 
+#: src/settingsdlg.c:627
+msgid "Method:"
+msgstr ""
+
+#: src/settingsdlg.c:644
+msgid "The IP address of the nameserver used for the kDNS method."
+msgstr ""
+
+#: src/settingsdlg.c:646
+#, fuzzy
+msgid "kDNS Server:"
+msgstr "/_Servidor"
+
+#: src/settingsdlg.c:740
+#, fuzzy
+msgid "The URL given for the keyserver is not valid."
+msgstr "El servidor de claves que especificÃ³ no es vÃ¡lido"
+
+#: src/settingsdlg.c:749
+msgid "The data given for \"Auto key locate\" is not valid."
+msgstr ""
+
+#: src/settingsdlg.c:886
+#, fuzzy
+msgid "GNU Privacy Assistant - Settings"
+msgstr "GNU Privacy Assistant - Editor del Anillo"
+
 #: src/siglist.c:128
 msgid "Level"
 msgstr "Nivel"
 
-#: src/siglist.c:135
-msgid "Local"
-msgstr "Local"
-
 #: src/verifydlg.c:116
 msgid "Verify documents"
 msgstr "Verificar documentos"
@@ -2076,3 +1890,333 @@
 #: src/verifydlg.c:370
 msgid "Signatures:"
 msgstr "Firmas:"
+
+#~ msgid "/File/C_lear"
+#~ msgstr "/Archivo/Li_mpiar"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Archivo/_Abrir"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Archivo/Guardar _Como"
+
+#~ msgid "/File/sep1"
+#~ msgstr "/Archivo/sep1"
+
+#~ msgid "/File/_Sign"
+#~ msgstr "/Archivo/_Firmar"
+
+#~ msgid "/File/_Verify"
+#~ msgstr "/Archivo/_Verificar"
+
+#~ msgid "/File/_Encrypt"
+#~ msgstr "/Archivo/_Cifrar"
+
+#~ msgid "/File/_Decrypt"
+#~ msgstr "/Archivo/_Descifrar"
+
+#~ msgid "/File/sep2"
+#~ msgstr "/Archivo/sep2"
+
+#~ msgid "/File/_Close"
+#~ msgstr "/Archivo/C_errar"
+
+#~ msgid "/File/_Quit"
+#~ msgstr "/Archivo/_Salir"
+
+#~ msgid "/Edit/_Undo"
+#~ msgstr "/Editar/_Copiar"
+
+#~ msgid "/Edit/_Redo"
+#~ msgstr "/Editar/_Rehacer"
+
+#~ msgid "/Edit/sep0"
+#~ msgstr "/Editar/sep0"
+
+#~ msgid "/Edit/Cut"
+#~ msgstr "/Editar/Co_rtar"
+
+#~ msgid "/Edit/_Copy"
+#~ msgstr "/Editar/_Copiar"
+
+#~ msgid "/Edit/_Paste"
+#~ msgstr "/Editar/_Pegar"
+
+#~ msgid "/Edit/_Delete"
+#~ msgstr "/Editar/_Eliminar"
+
+#~ msgid "/Edit/sep1"
+#~ msgstr "/Editar/sep1"
+
+#~ msgid "/Edit/Select _All"
+#~ msgstr "/Editar/Seleccionar _Todo"
+
+#~ msgid "/Edit/sep2"
+#~ msgstr "/Editar/sep2"
+
+#~ msgid "/Edit/Pr_eferences..."
+#~ msgstr "/Editar/Pr_eferencias..."
+
+#~ msgid "/Edit/_Backend Preferences..."
+#~ msgstr "/Editar/Pr_eferencias del motor..."
+
+#~ msgid "/_Windows"
+#~ msgstr "/_Ventanas"
+
+#~ msgid "/Windows/_Keyring Editor"
+#~ msgstr "/Ventanas/_Editor Anillo de Claves"
+
+#~ msgid "/Windows/_Filemanager"
+#~ msgstr "/Ventanas/Gestor de _Archivos"
+
+#~ msgid "/Windows/_Clipboard"
+#~ msgstr "/Ventanas/_Portapapeles"
+
+#~ msgid "/Edit/Copy"
+#~ msgstr "/Editar/Copiar"
+
+#~ msgid "/Edit/Paste"
+#~ msgstr "/Editar/Pegar"
+
+#~ msgid "clear buffer"
+#~ msgstr "limpiar buffer"
+
+#~ msgid "open file"
+#~ msgstr "abrir archivo"
+
+#~ msgid "save file as"
+#~ msgstr "guardar archivo como"
+
+#~ msgid "cut the selection"
+#~ msgstr "cortar la selecciÃ³n"
+
+#~ msgid "copy the selection"
+#~ msgstr "copiar la selecciÃ³n"
+
+#~ msgid "paste the clipboard"
+#~ msgstr "pegar el portapapeles"
+
+#~ msgid "Sign the selected text"
+#~ msgstr "Firmar el texto seleccionado"
+
+#~ msgid "verify text"
+#~ msgstr "verificar texto"
+
+#~ msgid "encrypt text"
+#~ msgstr "cifrar texto"
+
+#~ msgid "decrypt text"
+#~ msgstr "descifrar texto"
+
+#~ msgid "preferences"
+#~ msgstr "preferencias"
+
+#~ msgid "Open the keyring editor"
+#~ msgstr "Abrir el editor de anillo de claves"
+
+#~ msgid "keyring editor"
+#~ msgstr "editor del anillo de claves"
+
+#~ msgid "Open the file manager"
+#~ msgstr "Abrir el gestor de archivos"
+
+#~ msgid "file manager"
+#~ msgstr "gestor de archivos"
+
+#~ msgid "Help"
+#~ msgstr "Ayuda"
+
+#~ msgid "help"
+#~ msgstr "ayuda"
+
+#~ msgid "/File/Sign"
+#~ msgstr "/Archivo/Firmar"
+
+#~ msgid "/File/Verify"
+#~ msgstr "/Archivo/Verificar"
+
+#~ msgid "/File/Encrypt"
+#~ msgstr "/Archivo/Cifrar"
+
+#~ msgid "/File/Decrypt"
+#~ msgstr "/Archivo/Descifrar"
+
+#~ msgid "close files"
+#~ msgstr "cerrar archivos"
+
+#~ msgid "sign file"
+#~ msgstr "firmar archivo"
+
+#~ msgid "verify file"
+#~ msgstr "verificar archivo"
+
+#~ msgid "encrypt file"
+#~ msgstr "cifrar archivo"
+
+#~ msgid "decrypt file"
+#~ msgstr "descifrar archivo"
+
+#~ msgid "Open the clipboard"
+#~ msgstr "Abrir el portapapeles"
+
+#~ msgid "clipboard"
+#~ msgstr "portapapeles"
+
+#~ msgid "_Back"
+#~ msgstr "_AtrÃ¡s"
+
+#~ msgid "_Forward"
+#~ msgstr "_Siguiente"
+
+#~ msgid "_Apply"
+#~ msgstr "_Aplicar"
+
+#~ msgid "Brought to you by:"
+#~ msgstr "De la mano de:"
+
+#~ msgid "GPA is Free Software under the"
+#~ msgstr "GPA es Software Libre bajo la"
+
+#~ msgid "GNU General Public License."
+#~ msgstr "GNU General Public License,"
+
+#~ msgid "For news see:"
+#~ msgstr "Noticias en:"
+
+#~ msgid "http://www.gpg4win.org"
+#~ msgstr "http://www.gpg4win.org"
+
+#~ msgid "http://www.gnupg.org"
+#~ msgstr "http://www.gnupg.org"
+
+#~ msgid "GNU General Public License"
+#~ msgstr "GNU General Public License"
+
+#~ msgid "_GNU General Public License"
+#~ msgstr "_GNU General Public License"
+
+#~ msgid "Show Help Text\n"
+#~ msgstr "Mostrar texto de ayuda\n"
+
+#~ msgid "/_Help"
+#~ msgstr "/A_yuda"
+
+#~ msgid "/Help/_Contents"
+#~ msgstr "/Ayuda/_Contenidos"
+
+#~ msgid "/Help/_License"
+#~ msgstr "/Ayuda/_Licencia"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/Ayuda/Acerca de..."
+
+#~ msgid "Please insert your name"
+#~ msgstr "Por favor, introduzca su nombre"
+
+#~ msgid "Please insert your email address"
+#~ msgstr "Por favor introduzca su direcciÃ³n de correo electrÃ³nico"
+
+#~ msgid "/Keys/_Refresh"
+#~ msgstr "/Claves/_Actualizar"
+
+#~ msgid "/Keys/sep0"
+#~ msgstr "/Claves/sep0"
+
+#~ msgid "/Keys/_Delete Keys..."
+#~ msgstr "/Claves/_Borrar Claves..."
+
+#~ msgid "/Keys/sep1"
+#~ msgstr "/Claves/sep1"
+
+#~ msgid "/Keys/_Sign Keys..."
+#~ msgstr "/Claves/_Firmar Claves..."
+
+#~ msgid "/Keys/Set _Owner Trust..."
+#~ msgstr "/Claves/Establecer _Confianza en el Usuario..."
+
+#~ msgid "/Keys/_Edit Private Key..."
+#~ msgstr "/Claves/_Editar Clave Privada..."
+
+#~ msgid "/Keys/sep2"
+#~ msgstr "/Claves/sep2"
+
+#~ msgid "/Keys/_Import Keys..."
+#~ msgstr "/Claves/_Importar Claves..."
+
+#~ msgid "/Keys/E_xport Keys..."
+#~ msgstr "/Claves/E_xportar Claves..."
+
+#~ msgid "/Keys/_Backup..."
+#~ msgstr "/Claves/_Copia de Seguridad..."
+
+#~ msgid "/Server/_Send Keys..."
+#~ msgstr "/Servidor/_Enviar Claves..."
+
+#~ msgid "/Windows/_File Manager"
+#~ msgstr "/Ventanas/Gestor de _Archivos"
+
+#~ msgid "/Keys/Export Keys..."
+#~ msgstr "/Claves/Exportar Claves..."
+
+#~ msgid "/Keys/Delete Keys..."
+#~ msgstr "/Claves/Borrar Claves..."
+
+#~ msgid "/Server/Send Keys..."
+#~ msgstr "/Servidor/Enviar Claves..."
+
+#~ msgid "/Keys/Set Owner Trust..."
+#~ msgstr "/Claves/Establecer Confianza en el Usuario..."
+
+#~ msgid "/Keys/Sign Keys..."
+#~ msgstr "/Claves/Firmar Claves..."
+
+#~ msgid "/Keys/Edit Private Key..."
+#~ msgstr "/Claves/Editar Clave Privada..."
+
+#~ msgid "/Keys/Backup..."
+#~ msgstr "/Claves/Copia de Seguridad..."
+
+#~ msgid "/_Copy"
+#~ msgstr "/_Copiar"
+
+#~ msgid "/_Paste"
+#~ msgstr "/_Pegar"
+
+#~ msgid "/Set Owner Trust..."
+#~ msgstr "/Establecer Confianza en el Usuario..."
+
+#~ msgid "/Sign Keys..."
+#~ msgstr "/Firmar Claves..."
+
+#~ msgid "/Edit Private Key..."
+#~ msgstr "/Editar Clave Privada..."
+
+#~ msgid "/Backup..."
+#~ msgstr "/Copia de Seguridad..."
+
+#~ msgid "edit key"
+#~ msgstr "editar clave"
+
+#~ msgid "remove key"
+#~ msgstr "borrar clave"
+
+#~ msgid "sign key"
+#~ msgstr "firmar clave"
+
+#~ msgid "import keys"
+#~ msgstr "importar claves"
+
+#~ msgid "export keys"
+#~ msgstr "exportar claves"
+
+#~ msgid "brief"
+#~ msgstr "breve"
+
+#~ msgid "detailed"
+#~ msgstr "detallada"
+
+#~ msgid "refresh keyring"
+#~ msgstr "actualizar el anillo de llaves"
+
+#~ msgid "Settings"
+#~ msgstr "Preferencias"

Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/fr.po	2008-05-08 12:53:41 UTC (rev 891)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.7.0\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-03-20 22:28+0100\n"
+"POT-Creation-Date: 2008-05-08 14:51+0200\n"
 "PO-Revision-Date: 2008-03-11 20:06-0500\n"
 "Last-Translator: Fabian Rodriguez <fabian at legoutdulibre.com>\n"
 "Language-Team:  <fr at li.org>\n"
@@ -16,332 +16,152 @@
 "X-Generator: KBabel 0.9.6\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/clipboard.c:381 src/fileman.c:393
+#: src/clipboard.c:376 src/fileman.c:392
 msgid "Open File"
 msgstr "Ouvrir fichier"
 
-#: src/clipboard.c:409 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "Message de GPA"
 
 #. TRANSLATORS: The arguments are the filename, the integer size
 #. and the unit (such as KB or MB).
-#: src/clipboard.c:426
+#: src/clipboard.c:421
 #, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
 msgstr "Le fichier %s a une taille de %lli%s. Voulez-vous vraiment l'ouvrir ?"
 
-#: src/clipboard.c:547
+#: src/clipboard.c:542
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: src/clipboard.c:588 src/clipboard.c:618 src/clipboard.c:648
-#: src/clipboard.c:678 src/clipboard.c:1184 src/fileman.c:716
-#: src/keyring.c:1657
+#: src/clipboard.c:583 src/clipboard.c:613 src/clipboard.c:643
+#: src/clipboard.c:673 src/clipboard.c:1034
 msgid "Clipboard"
 msgstr "Presse-papiers"
 
-#: src/clipboard.c:758 src/fileman.c:513 src/keyring.c:863
-msgid "/_File"
+#: src/clipboard.c:755 src/fileman.c:515 src/keyring.c:884
+#, fuzzy
+msgid "_File"
 msgstr "/_Fichier"
 
-#: src/clipboard.c:759 src/fileman.c:515
-msgid "/File/C_lear"
-msgstr "/Fichier/_Remise Ã  zÃ©ro"
-
-#: src/clipboard.c:760 src/fileman.c:514
-msgid "/File/_Open"
-msgstr "/Fichier/_Ouvrir"
-
-#: src/clipboard.c:761
-msgid "/File/Save _As"
-msgstr "/Fichier/Enregistrer sous..."
-
-#: src/clipboard.c:763 src/fileman.c:516
-msgid "/File/sep1"
-msgstr "/Fichier/sep1"
-
-#: src/clipboard.c:764 src/fileman.c:517
-msgid "/File/_Sign"
-msgstr "/Fichier/_Signer"
-
-#: src/clipboard.c:765 src/fileman.c:518
-msgid "/File/_Verify"
-msgstr "/Fichier/_VÃ©rifier"
-
-#: src/clipboard.c:766 src/fileman.c:519
-msgid "/File/_Encrypt"
-msgstr "/Fichier/_Chiffrer"
-
-#: src/clipboard.c:767 src/fileman.c:520
-msgid "/File/_Decrypt"
-msgstr "/Fichier/_DÃ©chiffrer"
-
-#: src/clipboard.c:768 src/fileman.c:521
-msgid "/File/sep2"
-msgstr "/Fichier/sep2"
-
-#: src/clipboard.c:769 src/fileman.c:522 src/keyring.c:864
-msgid "/File/_Close"
-msgstr "/Fichier/_Fermer"
-
-#: src/clipboard.c:770 src/fileman.c:523 src/keyring.c:866
-msgid "/File/_Quit"
-msgstr "/Fichier/_Quitter"
-
-#: src/clipboard.c:773 src/fileman.c:526 src/keyring.c:869
-msgid "/_Edit"
+#: src/clipboard.c:756 src/fileman.c:516 src/keyring.c:885
+#, fuzzy
+msgid "_Edit"
 msgstr "/_Editer"
 
-#: src/clipboard.c:776
-msgid "/Edit/_Undo"
-msgstr "/Ã‰dition/Ann_uler"
+#: src/clipboard.c:760
+msgid "Clear buffer"
+msgstr "Effacer tampon"
 
-#: src/clipboard.c:777
-msgid "/Edit/_Redo"
-msgstr "/Ã‰dition/_Refaire"
+#: src/clipboard.c:762 src/fileman.c:520
+msgid "Open a file"
+msgstr "Ouvrir un fichier"
 
-#: src/clipboard.c:778
-msgid "/Edit/sep0"
-msgstr "/Ã‰dition/sep02"
+#: src/clipboard.c:764
+msgid "Save to a file"
+msgstr "Enregistrer dans un fichier"
 
-#: src/clipboard.c:780 src/clipboard.c:816
-msgid "/Edit/Cut"
-msgstr "/Ã‰dition/Couper"
+#: src/clipboard.c:766
+#, fuzzy
+msgid "Sign buffer text"
+msgstr "signer le texte"
 
-#: src/clipboard.c:781 src/keyring.c:870
-msgid "/Edit/_Copy"
-msgstr "/Ã‰dition/_Copier"
+#: src/clipboard.c:768
+#, fuzzy
+msgid "Check signatures of buffer text"
+msgstr "VÃ©rifier les signatures du texte sÃ©lectionnÃ©"
 
-#: src/clipboard.c:782 src/keyring.c:872
-msgid "/Edit/_Paste"
-msgstr "/Ã‰dition/_Coller"
+#: src/clipboard.c:770
+#, fuzzy
+msgid "Encrypt the buffer text"
+msgstr "Chiffrer le fichier sÃ©lectionnÃ©"
 
-#: src/clipboard.c:783
-msgid "/Edit/_Delete"
-msgstr "/Ã‰dition/_Effacer"
+#: src/clipboard.c:772
+#, fuzzy
+msgid "Decrypt the buffer text"
+msgstr "DÃ©chiffrer le texte sÃ©lectionnÃ©"
 
-#: src/clipboard.c:784 src/keyring.c:874
-msgid "/Edit/sep1"
-msgstr "/Ã‰dition/sep1"
-
-#: src/clipboard.c:785 src/fileman.c:527 src/keyring.c:875
-msgid "/Edit/Select _All"
-msgstr "/Ã‰dition/SÃ©lectionner _Tout"
-
-#: src/clipboard.c:787 src/fileman.c:528 src/keyring.c:876
-msgid "/Edit/sep2"
-msgstr "/Ã‰dition/sep2"
-
-#: src/clipboard.c:788 src/fileman.c:529 src/keyring.c:877
-msgid "/Edit/Pr_eferences..."
-msgstr "/Ã‰dition/PrÃ©fÃ©r_ences..."
-
-#: src/clipboard.c:790 src/fileman.c:531 src/keyring.c:879
-msgid "/Edit/_Backend Preferences..."
-msgstr "/Ã‰dition/PrÃ©fÃ©rences _Backend..."
-
-#: src/clipboard.c:794 src/fileman.c:535 src/keyring.c:906
-msgid "/_Windows"
-msgstr "/_FenÃªtres"
-
-#: src/clipboard.c:795 src/fileman.c:536 src/keyring.c:907
-msgid "/Windows/_Keyring Editor"
-msgstr "/FenÃªtres/_Editeur de trousseau"
-
-#: src/clipboard.c:796 src/fileman.c:537
-msgid "/Windows/_Filemanager"
-msgstr "/FenÃªtres/Gestionnaire de _fichiers"
-
-#: src/clipboard.c:797 src/fileman.c:538 src/keyring.c:909
-msgid "/Windows/_Clipboard"
-msgstr "/FenÃªtres/_Presse-papiers"
-
-#: src/clipboard.c:824 src/keyring.c:948
-msgid "/Edit/Copy"
-msgstr "/Edition/Copier"
-
-#: src/clipboard.c:832
-msgid "/Edit/Delete"
-msgstr "/Edition/Effacer"
-
-#: src/clipboard.c:840
-msgid "/Edit/Paste"
-msgstr "/Edition/_Coller"
-
-#: src/clipboard.c:945
-msgid "Clear buffer"
+#: src/clipboard.c:774
+#, fuzzy
+msgid "Close the buffer"
 msgstr "Effacer tampon"
 
-#: src/clipboard.c:945
-msgid "clear buffer"
-msgstr "effacer tampon"
+#: src/clipboard.c:776 src/fileman.c:534 src/keyring.c:893
+msgid "Quit the program"
+msgstr ""
 
-#: src/clipboard.c:953 src/fileman.c:643
-msgid "Open a file"
-msgstr "Ouvrir un fichier"
+#: src/clipboard.c:782
+#, fuzzy
+msgid "Undo the last action"
+msgstr "couper la sÃ©lection"
 
-#: src/clipboard.c:953 src/fileman.c:643
-msgid "open file"
-msgstr "ouvrir fichier"
+#: src/clipboard.c:784
+msgid "Redo the last undone action"
+msgstr ""
 
-#: src/clipboard.c:958
-msgid "Save to a file"
-msgstr "Enregistrer dans un fichier"
-
-#: src/clipboard.c:958
-msgid "save file as"
-msgstr "enregistrer le fichier _comme"
-
-#: src/clipboard.c:966
+#: src/clipboard.c:787
 msgid "Cut the selection"
 msgstr "Couper la sÃ©lection"
 
-#: src/clipboard.c:967
-msgid "cut the selection"
-msgstr "couper la sÃ©lection"
-
-#: src/clipboard.c:973
+#: src/clipboard.c:789 src/keyring.c:897
 msgid "Copy the selection"
 msgstr "couper la sÃ©lection"
 
-#: src/clipboard.c:974
-msgid "copy the selection"
-msgstr "copier la sÃ©lection"
-
-#: src/clipboard.c:980
+#: src/clipboard.c:791 src/keyring.c:899
 msgid "Paste the clipboard"
 msgstr "Coller le presse-papiers"
 
-#: src/clipboard.c:981
-msgid "paste the clipboard"
-msgstr "coller le presse-papiers"
-
-#: src/clipboard.c:991 src/fileman.c:653 src/keyring.c:1570
-msgid "Sign"
-msgstr "Signer"
-
-#: src/clipboard.c:992
-msgid "Sign the selected text"
-msgstr "Signer le texte sÃ©lectionnÃ©"
-
-#: src/clipboard.c:993
-msgid "sign text"
-msgstr "signer le texte"
-
-#: src/clipboard.c:1001 src/fileman.c:664
-msgid "Verify"
-msgstr "VÃ©rifier"
-
-#: src/clipboard.c:1002
-msgid "Check signatures of selected text"
-msgstr "VÃ©rifier les signatures du texte sÃ©lectionnÃ©"
-
-#: src/clipboard.c:1003
-msgid "verify text"
-msgstr "vÃ©rifier texte"
-
-#: src/clipboard.c:1011 src/fileman.c:675
-msgid "Encrypt"
-msgstr "Chiffrer"
-
-#: src/clipboard.c:1012
-msgid "Encrypt the selected text"
-msgstr "Chiffrer le fichier sÃ©lectionnÃ©"
-
-#: src/clipboard.c:1013
-msgid "encrypt text"
-msgstr "chiffrer texte"
-
-#: src/clipboard.c:1021 src/fileman.c:686
-msgid "Decrypt"
-msgstr "_DÃ©chiffrer"
-
-#: src/clipboard.c:1022
-msgid "Decrypt the selected text"
+#: src/clipboard.c:793
+#, fuzzy
+msgid "Delete the selected text"
 msgstr "DÃ©chiffrer le texte sÃ©lectionnÃ©"
 
-#: src/clipboard.c:1023
-msgid "decrypt text"
-msgstr "dÃ©chiffrer texte"
+#: src/clipboard.c:795
+msgid "Select the entire document"
+msgstr ""
 
-#: src/clipboard.c:1033 src/fileman.c:699 src/keyring.c:1631
-msgid "Open the preferences dialog"
-msgstr "Ouvrir la fenÃªtre des prÃ©fÃ©rences"
-
-#: src/clipboard.c:1034 src/fileman.c:700 src/keyring.c:1632
-msgid "preferences"
-msgstr "prÃ©fÃ©rences"
-
-#: src/clipboard.c:1041 src/fileman.c:707
+#: src/clipboard.c:902 src/fileman.c:625
 msgid "Keyring"
 msgstr "Trousseau de clefs"
 
-#: src/clipboard.c:1042 src/fileman.c:708
-msgid "Open the keyring editor"
-msgstr "Ouvrir l'Ã©diteur de trousseau de clefs"
-
-#: src/clipboard.c:1043 src/fileman.c:709
-msgid "keyring editor"
-msgstr "Ã©diteur de trousseau de clefs"
-
-#: src/clipboard.c:1049 src/keyring.c:1648
+#: src/clipboard.c:904 src/keyring.c:1073
 msgid "Files"
 msgstr "Fichiers"
 
-#: src/clipboard.c:1050 src/keyring.c:1649
-msgid "Open the file manager"
-msgstr "Ouvrir le gestionnaire de fichiers"
-
-#: src/clipboard.c:1051 src/keyring.c:1650
-msgid "file manager"
-msgstr "/FenÃªtres/_Gestionnaire de fichier"
-
-#: src/clipboard.c:1058 src/fileman.c:725 src/keyring.c:1665
-msgid "Help"
-msgstr "Aide"
-
-#: src/clipboard.c:1059 src/fileman.c:726 src/keyring.c:1666
-msgid "Understanding the GNU Privacy Assistant"
-msgstr "Comprendre GNU Privacy Assistant"
-
-#: src/clipboard.c:1060 src/fileman.c:727 src/keyring.c:1667
-msgid "help"
-msgstr "aide"
-
-#: src/clipboard.c:1150
+#: src/clipboard.c:1004
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Privacy Assistant - Presse-papiers"
 
-#: src/confdialog.c:993
+#: src/confdialog.c:994
 msgid "<b>Main</b>"
 msgstr "<b>Principal</b>"
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default values"
 msgstr "Utiliser les valeurs par dÃ©faut"
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default value"
 msgstr "Utiliser la valeur par dÃ©faut"
 
-#: src/confdialog.c:1146
+#: src/confdialog.c:1147
 msgid "Do not use option"
 msgstr "Ne pas utiliser l'option"
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom values"
 msgstr "Utiliser des valeurs personnalisÃ©es"
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom value"
 msgstr "Utiliser la valeur personnalisÃ©e"
 
-#: src/confdialog.c:1155
+#: src/confdialog.c:1156
 msgid "Use default argument"
 msgstr "Utiliser l'argument par dÃ©faut"
 
-#: src/confdialog.c:1280
+#: src/confdialog.c:1281
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
@@ -349,58 +169,51 @@
 "Vous avez demandÃ© des changements qui ne sont pas appliquÃ©s. Changer au mode "
 "expert appliqueraces changements. DÃ©sirez-vous continuer ?"
 
-#: src/confdialog.c:1325
+#: src/confdialog.c:1326
 msgid "Crypto Backend Configuration"
 msgstr "Configuration du backend de chiffrement"
 
-#: src/confdialog.c:1334
+#: src/confdialog.c:1332
 msgid "Reset"
 msgstr "RÃ©initialisation"
 
-#: src/confdialog.c:1346
+#: src/confdialog.c:1351
 msgid "Configure the tools of the GnuPG system."
 msgstr "Configurer les outils de votre installation GnuPG"
 
-#: src/confdialog.c:1350
+#: src/confdialog.c:1355
 msgid "Level:"
 msgstr "Niveau:"
 
-#: src/confdialog.c:1359
+#: src/confdialog.c:1364
 msgid "Basic"
 msgstr "Base"
 
-#: src/confdialog.c:1360
+#: src/confdialog.c:1365
 msgid "Advanced"
 msgstr "AvancÃ©"
 
-#: src/confdialog.c:1361
+#: src/confdialog.c:1366
 msgid "Expert"
 msgstr "Expert"
 
-#: src/encryptdlg.c:142 src/expirydlg.c:116 src/filesigndlg.c:133
-#: src/gpaprogressdlg.c:146 src/gparecvkeydlg.c:96 src/gpawizard.c:289
-#: src/gpgmetools.c:705 src/keygendlg.c:149 src/ownertrustdlg.c:111
-#: src/passwddlg.c:100
-msgid "_Cancel"
-msgstr "_Annuler"
-
-#: src/encryptdlg.c:143
+#: src/encryptdlg.c:139
 msgid "Encrypt documents"
 msgstr "Chiffrer des documents"
 
-#: src/encryptdlg.c:174
+#: src/encryptdlg.c:156
 msgid "_Public Keys"
 msgstr "Clefs _Publiques"
 
-#: src/encryptdlg.c:177
+#: src/encryptdlg.c:179 src/icons.c:198
 msgid "_Sign"
 msgstr "_Signer"
 
-#: src/encryptdlg.c:201 src/filesigndlg.c:185
+#: src/encryptdlg.c:185
 msgid "Sign _as "
 msgstr "Signer _comme"
 
-#: src/encryptdlg.c:215 src/filesigndlg.c:187
+#: src/encryptdlg.c:215 src/filesigndlg.c:227
 msgid "A_rmor"
 msgstr "A_rmure"
 
@@ -408,116 +221,94 @@
 msgid "Please provide a correct date."
 msgstr "Veuillez indiquer une date correcte."
 
-#: src/expirydlg.c:111
+#: src/expirydlg.c:108
 msgid "Change expiry date"
 msgstr "Changer la date d'expiration"
 
-#: src/expirydlg.c:129
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+msgid "_Cancel"
+msgstr "_Annuler"
+
+#: src/expirydlg.c:124
 msgid "_never expire"
 msgstr "_n'expire jamais"
 
-#: src/expirydlg.c:134
+#: src/expirydlg.c:129
 msgid "_expire on:"
 msgstr "_expire le"
 
-#: src/fileman.c:557
-msgid "/File/Sign"
-msgstr "/Fichier/_Signer"
-
-#: src/fileman.c:562
-msgid "/File/Verify"
-msgstr "/Fichier/VÃ©rifier"
-
-#: src/fileman.c:567
-msgid "/File/Encrypt"
-msgstr "/Fichier/_Chiffrer"
-
-#: src/fileman.c:572
-msgid "/File/Decrypt"
-msgstr "/Fichier/_DÃ©chiffrer"
-
-#: src/fileman.c:647
+#: src/fileman.c:522
 msgid "Close all files"
 msgstr "Fermer tous les fichiers"
 
-#: src/fileman.c:647
-msgid "close files"
-msgstr "fermer fichiers"
-
-#: src/fileman.c:654
+#: src/fileman.c:524
 msgid "Sign the selected file"
 msgstr "Signer le fichier sÃ©lectionnÃ©"
 
-#: src/fileman.c:655
-msgid "sign file"
-msgstr "signer fichier"
-
-#: src/fileman.c:665
+#: src/fileman.c:526
 msgid "Check signatures of selected file"
 msgstr "VÃ©rifier les signatures du fichiers sÃ©lectionnÃ©"
 
-#: src/fileman.c:666
-msgid "verify file"
-msgstr "vÃ©rifier fichier"
-
-#: src/fileman.c:676
+#: src/fileman.c:528
 msgid "Encrypt the selected file"
 msgstr "Chiffrer le fichier sÃ©lectionnÃ©"
 
-#: src/fileman.c:677
-msgid "encrypt file"
-msgstr "chiffrer fichier"
-
-#: src/fileman.c:687
+#: src/fileman.c:530
 msgid "Decrypt the selected file"
 msgstr "DÃ©chiffrer le fichier sÃ©lectionnÃ©"
 
-#: src/fileman.c:688
-msgid "decrypt file"
-msgstr "dÃ©chiffrer fichier"
+#: src/fileman.c:532
+msgid "Close the window"
+msgstr ""
 
-#: src/fileman.c:717 src/keyring.c:1658
-msgid "Open the clipboard"
-msgstr "Ouvrir le presse-papiers"
+#: src/fileman.c:538
+#, fuzzy
+msgid "Select all files"
+msgstr "Fermer tous les fichiers"
 
-#: src/fileman.c:718 src/keyring.c:1659
-msgid "clipboard"
-msgstr "presse-papiers"
-
-#: src/fileman.c:826
+#: src/fileman.c:731
 msgid "File"
 msgstr "Fichier"
 
-#: src/fileman.c:891
+#: src/fileman.c:796
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Gestionnaire de fichiers"
 
-#: src/fileman.c:917
+#: src/fileman.c:819
 msgid "File Manager"
 msgstr "Gestionnaire de fichiers"
 
-#: src/fileman.c:993
+#: src/fileman.c:895
 msgid "The file is already open."
 msgstr "Le fichier est dÃ©jÃ  ouvert."
 
-#: src/filesigndlg.c:134
+#: src/filesigndlg.c:171
 msgid "Sign documents"
 msgstr "Signes les documents"
 
-#: src/filesigndlg.c:144
-msgid "Signing Mode"
+#: src/filesigndlg.c:180
+#, fuzzy
+msgid "<b>Sign _as</b>"
+msgstr "<b>Principal</b>"
+
+#: src/filesigndlg.c:201
+#, fuzzy
+msgid "<b>Signing Mode</b>"
 msgstr "Mode de signature"
 
-#: src/filesigndlg.c:152
-msgid "si_gn and compress"
+#: src/filesigndlg.c:211
+#, fuzzy
+msgid "Si_gn and compress"
 msgstr "si_gner et compresser"
 
-#: src/filesigndlg.c:158
-msgid "_cleartext signature"
+#: src/filesigndlg.c:217
+#, fuzzy
+msgid "Clear_text signature"
 msgstr "signature en _clair"
 
-#: src/filesigndlg.c:165
-msgid "_detached signature"
+#: src/filesigndlg.c:223
+#, fuzzy
+msgid "_Detached signature"
 msgstr "signature _dÃ©tachÃ©e"
 
 #: src/gpabackupop.c:208
@@ -567,22 +358,28 @@
 msgstr "Ouvrir le presse-papiers"
 
 #: src/gpa.c:100
-msgid "Start only the UI server (implies --cms)"
+#, fuzzy
+msgid "Open the settings dialog"
+msgstr "Ouvrir la fenÃªtre des prÃ©fÃ©rences"
+
+#: src/gpa.c:102
+#, fuzzy
+msgid "Enable the UI server (implies --cms)"
 msgstr "DÃ©marrer seulement le serveur d'interface graphique (implique --cms)"
 
-#: src/gpa.c:102
+#: src/gpa.c:104
 msgid "Read options from file"
 msgstr "Lire les options depuis le fichier"
 
-#: src/gpa.c:293
+#: src/gpa.c:286
 msgid "[FILE...]"
 msgstr "[FICHIER...]"
 
-#: src/gpa.c:295
+#: src/gpa.c:288
 msgid "Graphical frontend to GnuPG"
 msgstr "Interface graphique pour GnuPG"
 
-#: src/gpa.c:296
+#: src/gpa.c:289
 msgid "Please report bugs to <"
 msgstr "Veuillez envoyer vos rapports de faille Ã  <"
 
@@ -614,15 +411,15 @@
 "clÃ© publique (\"%s\").\n"
 "ÃŠtes-vous certain de vouloir distribuer cette clÃ©?"
 
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:455
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:459
 #: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:62 src/settingsdlg.c:165
+#: src/keydeletedlg.c:93 src/keysigndlg.c:61
 msgid "_Yes"
 msgstr "_Oui"
 
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:456
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:460
 #: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:64 src/settingsdlg.c:168
+#: src/keydeletedlg.c:95 src/keysigndlg.c:63
 msgid "_No"
 msgstr "_Non"
 
@@ -634,29 +431,29 @@
 msgid "Decrypting..."
 msgstr "DÃ©chiffrement..."
 
-#: src/gpafiledecryptop.c:358 src/gpafileverifyop.c:449
+#: src/gpafiledecryptop.c:367 src/gpafileverifyop.c:464
 #, c-format
 msgid "\"%s\" contained no OpenPGP data."
 msgstr "Le fichier \"%s\" ne contient pas de donnÃ©es OpenPGP valides."
 
-#: src/gpafiledecryptop.c:359 src/gpafileverifyop.c:450
+#: src/gpafiledecryptop.c:368 src/gpafileverifyop.c:465
 #, c-format
 msgid "The file \"%s\" contained no OpenPGPdata."
 msgstr "Le fichier \"%s\" ne contient pas de donnÃ©es OpenPGP valides."
 
-#: src/gpafiledecryptop.c:369
+#: src/gpafiledecryptop.c:378
 #, c-format
 msgid "\"%s\" contained no valid encrypted data."
 msgstr "Le fichier \"%s\" ne contient pas de donnÃ©es OpenPGP valides."
 
-#: src/gpafiledecryptop.c:371
+#: src/gpafiledecryptop.c:380
 #, c-format
 msgid "The file \"%s\" contained no validencrypted data."
 msgstr "Le fichier \"%s\" ne contient pas de donnÃ©es OpenPGP valides."
 
-#: src/gpafiledecryptop.c:380 src/gpafileencryptop.c:757
-#: src/gpafilesignop.c:511 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
-#: src/gpakeypasswdop.c:197 src/gpakeysignop.c:229
+#: src/gpafiledecryptop.c:389 src/gpafileencryptop.c:751
+#: src/gpafilesignop.c:525 src/gpafileverifyop.c:475 src/gpakeyexpireop.c:240
+#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:237
 msgid "Wrong passphrase!"
 msgstr "Mot de passe incorrect!"
 
@@ -664,58 +461,57 @@
 msgid "Encrypting..."
 msgstr "Chiffrement..."
 
-#: src/gpafileencryptop.c:453 src/verifydlg.c:222
+#: src/gpafileencryptop.c:457 src/verifydlg.c:222
 msgid "Unknown Key"
 msgstr "Clef inconnue"
 
-#: src/gpafileencryptop.c:469
+#: src/gpafileencryptop.c:473
 msgid "You are going to encrypt a document using the following key:"
 msgstr "Vous allez chiffrer un document Ã  l'aide de cette clef:"
 
-#: src/gpafileencryptop.c:475
+#: src/gpafileencryptop.c:479
 msgid "However, it is not certain that the key belongs to that person."
 msgstr ""
 "Cependant, il n'est pas certain que cette clef appartienne Ã  cette personne."
 
-#: src/gpafileencryptop.c:481
+#: src/gpafileencryptop.c:485
 msgid "Do you <b>really</b> want to use this key?"
 msgstr "Etes-vous <b>certain</b> de vouloir utiliser cette clef ?"
 
-#: src/gpafileencryptop.c:502 src/gpafileencryptop.c:542 src/verifydlg.c:227
+#: src/gpafileencryptop.c:506 src/gpafileencryptop.c:546 src/verifydlg.c:227
 msgid "Revoked Key"
 msgstr "Clef rÃ©voquÃ©e"
 
-#: src/gpafileencryptop.c:504 src/gpafileencryptop.c:544 src/gpawizard.c:281
-#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:436
-#: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
+#: src/gpafileencryptop.c:508 src/gpafileencryptop.c:548 src/gtktools.c:52
+#: src/gtktools.c:86 src/keyeditdlg.c:149 src/verifydlg.c:115
 msgid "_Close"
 msgstr "_Fermer"
 
-#: src/gpafileencryptop.c:517
+#: src/gpafileencryptop.c:521
 msgid "The following key has been revoked by it's owner:"
 msgstr "La clef suivante a Ã©tÃ© rÃ©voquÃ©e par son propriÃ©taire:"
 
-#: src/gpafileencryptop.c:522 src/gpafileencryptop.c:565
+#: src/gpafileencryptop.c:526 src/gpafileencryptop.c:569
 msgid "And can not be used for encryption."
 msgstr "et ne peut Ãªtre utilisÃ©e pour le chiffrement."
 
-#: src/gpafileencryptop.c:557
+#: src/gpafileencryptop.c:561
 #, c-format
 msgid "The following key expired on %s:"
 msgstr "La clef suivante a expirÃ© le %s"
 
-#: src/gpafileencryptop.c:596 src/gpafilesignop.c:429
+#: src/gpafileencryptop.c:600 src/gpafilesignop.c:448
 msgid ""
 "The selected certificates are not all of the same type. That is, you mixed "
 "OpenPGP and X.509 certificates. Please make sure to select only certificates "
 "of the same type."
 msgstr ""
 
-#: src/gpafileencryptop.c:671 src/gpafilesignop.c:415
+#: src/gpafileencryptop.c:675 src/gpafilesignop.c:434
 msgid "You didn't select any key for signing"
 msgstr "Vous n'avez pas sÃ©lectionnÃ© une clef pour signer"
 
-#: src/gpafilesignop.c:148
+#: src/gpafilesignop.c:157
 msgid "Signing..."
 msgstr "Signature..."
 
@@ -744,11 +540,11 @@
 msgid "Import public keys from file"
 msgstr "Importer des clefs publiques d'un fichier"
 
-#: src/gpaimportop.c:197
+#: src/gpaimportop.c:196
 msgid "No keys were found."
 msgstr "Clefs introuvables."
 
-#: src/gpaimportop.c:205
+#: src/gpaimportop.c:204
 #, c-format
 msgid ""
 "%i public keys read\n"
@@ -765,7 +561,7 @@
 "%i clefs secrÃ¨tes importÃ©es\n"
 "%i clefs secrÃ¨tes inchangÃ©es"
 
-#: src/gpakeyexpireop.c:239
+#: src/gpakeyexpireop.c:244
 msgid ""
 "Invalid time given.\n"
 "(you may not set the expiration time to the past.)"
@@ -773,29 +569,29 @@
 "La date est invalide.\n"
 "(la date d'expiration ne peut Ãªtre situÃ©e dans le passÃ©.)"
 
-#: src/gpakeyselector.c:86 src/keylist.c:567 src/siglist.c:94
+#: src/gpakeyselector.c:86 src/keylist.c:555 src/siglist.c:94
 #: src/siglist.c:114 src/verifydlg.c:324
 msgid "Key ID"
 msgstr "ID de clef"
 
-#: src/gpakeyselector.c:95 src/keylist.c:618 src/siglist.c:100
+#: src/gpakeyselector.c:95 src/keylist.c:606 src/siglist.c:100
 #: src/siglist.c:143 src/verifydlg.c:336
 msgid "User Name"
 msgstr "Nom d'utilisateur"
 
-#: src/gpakeysignop.c:188
+#: src/gpakeysignop.c:191
 msgid "No private key for signing."
 msgstr "Aucune clef privÃ©e pour signer."
 
-#: src/gpakeysignop.c:233
+#: src/gpakeysignop.c:241
 msgid "This key has expired! Unable to sign."
 msgstr "Cette clef a expirÃ©! Impossible de signer."
 
-#: src/gpakeysignop.c:237
+#: src/gpakeysignop.c:245
 msgid "This key has already been signed with your own!"
 msgstr "Cette clef a dÃ©jÃ  Ã©tÃ© signÃ©e par la vÃ´tre!"
 
-#: src/gpakeysignop.c:242
+#: src/gpakeysignop.c:250
 msgid "You haven't selected a default key to sign with!"
 msgstr "Pas de clef par dÃ©faut pour signer!"
 
@@ -823,7 +619,7 @@
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/gparecvkeydlg.c:101
+#: src/gparecvkeydlg.c:106
 msgid "Which key do you want to import? (The key must be specified by key ID)."
 msgstr ""
 "Quelle clef dÃ©sirez-vous importer (La clef doit Ãªtre spÃ©cifiÃ©e par son ID de "
@@ -849,7 +645,7 @@
 msgid "Size"
 msgstr "Taille"
 
-#: src/gpasubkeylist.c:97 src/keyeditdlg.c:171 src/keylist.c:580
+#: src/gpasubkeylist.c:97 src/keyeditdlg.c:168 src/keylist.c:568
 msgid "Expiry Date"
 msgstr "Expiration"
 
@@ -869,12 +665,12 @@
 msgid "Can authenticate"
 msgstr "Authentifie"
 
-#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:830
-#: src/gpgmetools.c:949
+#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:833
+#: src/gpgmetools.c:952
 msgid "Revoked"
 msgstr "RÃ©voquÃ©e"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:945
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:948
 msgid "Expired"
 msgstr "ExpirÃ©e"
 
@@ -886,21 +682,21 @@
 msgid "Unsigned"
 msgstr "Non-signÃ©"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:936 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:939 src/verifydlg.c:212
 msgid "Valid"
 msgstr "Valide"
 
 #: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
-#: src/keyring.c:1176 src/keysigndlg.c:104
+#: src/keyring.c:1248 src/keysigndlg.c:100
 msgid "User Name:"
 msgstr "Nom d'utilisateur:"
 
-#: src/gpawidgets.c:72 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/keysigndlg.c:100
 msgid "User Names:"
 msgstr "Noms d'utilisateur:"
 
 #: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
-#: src/keyring.c:1178
+#: src/keyring.c:1250
 msgid "Key ID:"
 msgstr "ID de clef:"
 
@@ -912,15 +708,15 @@
 msgid "_indefinitely valid"
 msgstr "valide Ã  perpetuitÃ©"
 
-#: src/gpawidgets.c:196
+#: src/gpawidgets.c:195
 msgid "expire _after"
 msgstr "expire _aprÃ¨s"
 
-#: src/gpawidgets.c:216
+#: src/gpawidgets.c:215
 msgid "expire o_n:"
 msgstr "_expire le"
 
-#: src/gpawidgets.c:292 src/keygendlg.c:295
+#: src/gpawidgets.c:289 src/keygendlg.c:291
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -928,19 +724,7 @@
 "!ERREUR FATALE!\n"
 "Mode d'insertion invalide pour la date d'expiration."
 
-#: src/gpawizard.c:260
-msgid "_Back"
-msgstr "_Revenir"
-
-#: src/gpawizard.c:267
-msgid "_Forward"
-msgstr "_Continuer"
-
-#: src/gpawizard.c:274
-msgid "_Apply"
-msgstr "_Appliquer"
-
-#: src/gpgmetools.c:58
+#: src/gpgmetools.c:59
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -957,7 +741,7 @@
 "\n"
 "L'application va se terminer"
 
-#: src/gpgmetools.c:72
+#: src/gpgmetools.c:73
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -1020,7 +804,7 @@
 msgstr "DSA (signature seulement)"
 
 #: src/gpgmetools.c:590 src/gpgmetools.c:613 src/gpgmetools.c:630
-#: src/gpgmetools.c:941 src/gpgmetools.c:974
+#: src/gpgmetools.c:944 src/gpgmetools.c:977
 msgid "Unknown"
 msgstr "inconnu"
 
@@ -1060,57 +844,57 @@
 msgid "Enter Passphrase"
 msgstr "Entrer le mot de passe"
 
-#: src/gpgmetools.c:823
+#: src/gpgmetools.c:826
 msgid "[None]"
 msgstr "[Aucun]"
 
-#: src/gpgmetools.c:913 src/verifydlg.c:269
+#: src/gpgmetools.c:916 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[ID d'utilisateur inconnu]"
 
-#: src/gpgmetools.c:939 src/verifydlg.c:217
+#: src/gpgmetools.c:942 src/verifydlg.c:217
 msgid "Bad"
 msgstr "Mauvaise"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:965
 msgid "Generic"
 msgstr "GÃ©nÃ©rique"
 
-#: src/gpgmetools.c:965
+#: src/gpgmetools.c:968
 msgid "Persona"
 msgstr "Personnelle"
 
-#: src/gpgmetools.c:968
+#: src/gpgmetools.c:971
 msgid "Casual"
 msgstr "Informelle"
 
-#: src/gpgmetools.c:971
+#: src/gpgmetools.c:974
 msgid "Positive"
 msgstr "Positive"
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:992
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 "La clef peut Ãªtre utilisÃ©e pour fins de certification, de signature et de "
 "chiffrement."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:995
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "La clef peut Ãªtre utilisÃ©e pour fins de certification et de signature mais "
 "pas de chiffrement."
 
-#: src/gpgmetools.c:998
+#: src/gpgmetools.c:1001
 msgid "The key can be used for certification and encryption."
 msgstr ""
 "La clef peut Ãªtre utilisÃ©e pour fins de certification et de chiffrement."
 
-#: src/gpgmetools.c:1001
+#: src/gpgmetools.c:1004
 msgid "The key can be used only for certification."
 msgstr "La clef peut Ãªtre utilisÃ©e pour fins de certification seulement."
 
-#: src/gpgmetools.c:1009
+#: src/gpgmetools.c:1012
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -1118,78 +902,71 @@
 "La clef peut Ãªtre utilisÃ©e pour fins de signature et de chiffrement mais pas "
 "de certification."
 
-#: src/gpgmetools.c:1012
+#: src/gpgmetools.c:1015
 msgid "The key can be used only for signing."
 msgstr "La clef peut Ãªtre utilisÃ©e pour fins de signature seulement."
 
-#: src/gpgmetools.c:1017
+#: src/gpgmetools.c:1020
 msgid "The key can be used only for encryption."
 msgstr "La clef peut Ãªtre utilisÃ©e pour fins de chiffrement seulement."
 
-#: src/gpgmetools.c:1020
+#: src/gpgmetools.c:1023
 msgid "This key is useless."
 msgstr "Cette clef est inutilisable."
 
-#: src/gtktools.c:320
+#: src/gtktools.c:48
 msgid "GPA Error"
 msgstr "Erreur GPA"
 
-#: src/helpmenu.c:216
+#: src/helpmenu.c:83
 msgid "About GPA"
 msgstr "Ã€ propos de GPA"
 
-#: src/helpmenu.c:261
-msgid "Brought to you by:"
-msgstr "Vous est fourni par:"
+#: src/helpmenu.c:89
+#, fuzzy
+msgid "GPA is the GNU Privacy Assistant."
+msgstr "Comprendre GNU Privacy Assistant"
 
-#: src/helpmenu.c:298
-msgid "GPA is Free Software under the"
-msgstr "GPA est un logiciel libre distribuÃ©"
+#: src/icons.c:199
+#, fuzzy
+msgid "_Verify"
+msgstr "VÃ©rifier"
 
-#: src/helpmenu.c:302
-msgid "GNU General Public License."
-msgstr "sous License GÃ©nÃ©rale Publique GNU."
+#: src/icons.c:200
+#, fuzzy
+msgid "_Encrypt"
+msgstr "Chiffrer"
 
-#: src/helpmenu.c:306
-msgid "For news see:"
-msgstr "Pour des nouvelles, voir:"
+#: src/icons.c:201
+#, fuzzy
+msgid "_Decrypt"
+msgstr "_DÃ©chiffrer"
 
-#: src/helpmenu.c:311
-msgid "http://www.gpg4win.org"
-msgstr "http://www.gpg4win.org"
+#: src/icons.c:202
+#, fuzzy
+msgid "_Brief"
+msgstr "RÃ©sumÃ©e"
 
-#: src/helpmenu.c:313
-msgid "http://www.gnupg.org"
-msgstr "http://www.gnupg.org"
+#: src/icons.c:203
+#, fuzzy
+msgid "_Detailed"
+msgstr "DÃ©taillÃ©e"
 
-#: src/helpmenu.c:396
-msgid "GNU General Public License"
-msgstr "GNU General Gublic License"
+#: src/icons.c:204
+#, fuzzy
+msgid "_Keyring Editor"
+msgstr "Ã‰diteur de trousseau de clefs"
 
-#: src/helpmenu.c:423
-msgid "_GNU General Public License"
-msgstr "GNU general public license"
+#: src/icons.c:205
+#, fuzzy
+msgid "_Clipboard"
+msgstr "Presse-papiers"
 
-#: src/helpmenu.c:450
-msgid "Show Help Text\n"
-msgstr "Montrer le texte d'aide\n"
+#: src/icons.c:206
+#, fuzzy
+msgid "_File Manager"
+msgstr "Gestionnaire de fichiers"
 
-#: src/helpmenu.c:458
-msgid "/_Help"
-msgstr "/_Aide"
-
-#: src/helpmenu.c:460
-msgid "/Help/_Contents"
-msgstr "/Aide/_Contenu"
-
-#: src/helpmenu.c:463
-msgid "/Help/_License"
-msgstr "/Aide/_Licence"
-
-#: src/helpmenu.c:464
-msgid "/Help/_About"
-msgstr "/Aide/_Ã€ propos"
-
 #: src/keydeletedlg.c:41
 msgid "Removing Secret Key"
 msgstr "Suppression de clef secrÃ¨te"
@@ -1236,23 +1013,28 @@
 msgid "Are you sure you want to delete this key?"
 msgstr "Etes-vous certain de vouloir effacer cette clef?"
 
-#: src/keyeditdlg.c:149
+#: src/keyeditdlg.c:147
 msgid "Edit Key"
 msgstr "Ã‰diter la clef"
 
-#: src/keyeditdlg.c:165
+#: src/keyeditdlg.c:162
 msgid "Change _passphrase"
 msgstr "Changer le mot de _passe"
 
-#: src/keyeditdlg.c:185
+#: src/keyeditdlg.c:182
 msgid "Change _expiration"
 msgstr "Changer l'_expiration"
 
-#: src/keygendlg.c:58
+#: src/keygendlg.c:67
+#, fuzzy
+msgid "You must enter a key size."
+msgstr "Vous devez entrer un identificateur d'usager."
+
+#: src/keygendlg.c:72
 msgid "You must enter a User ID."
 msgstr "Vous devez entrer un identificateur d'usager."
 
-#: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
+#: src/keygendlg.c:77 src/passwddlg.c:45
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -1260,7 +1042,7 @@
 "Dans \"Mot de passe\" et \"RÃ©pÃ©ter le mot de passe\",\n"
 "vous devez entrer le mÃªme mot de passe."
 
-#: src/keygendlg.c:70 src/keygenwizard.c:314 src/passwddlg.c:52
+#: src/keygendlg.c:84 src/passwddlg.c:52
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1268,7 +1050,7 @@
 "Vous n'avez pas entrÃ© de mot de passe.\n"
 "C'est nÃ©cessaire pour protÃ©ger votre clef privÃ©e."
 
-#: src/keygendlg.c:83 src/keygenwizard.c:328 src/passwddlg.c:65
+#: src/keygendlg.c:97 src/passwddlg.c:65
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1280,23 +1062,25 @@
 "\n"
 "Veuilez entrer un nouveau mot de passe."
 
-#: src/keygendlg.c:88 src/keygenwizard.c:333 src/passwddlg.c:70
+#: src/keygendlg.c:102 src/passwddlg.c:70
 msgid "_Enter new passphrase"
 msgstr "_Entrer le nouveau mot de passe"
 
-#: src/keygendlg.c:89 src/keygenwizard.c:334 src/passwddlg.c:71
+#: src/keygendlg.c:104 src/passwddlg.c:71
 msgid "Take this one _anyway"
 msgstr "Prendre celui lÃ  _quand mÃªme"
 
-#: src/keygendlg.c:144 src/keygenwizard.c:541
+#: src/keygendlg.c:150 src/keygenwizard.c:571 src/keygenwizard.c:584
+#: src/keygenwizard.c:594 src/keygenwizard.c:604 src/keygenwizard.c:616
+#: src/keygenwizard.c:633 src/keygenwizard.c:645
 msgid "Generate key"
 msgstr "GÃ©nÃ©rer clef"
 
-#: src/keygendlg.c:185
+#: src/keygendlg.c:177
 msgid "_Algorithm: "
 msgstr "_Algorithme de chiffrement: "
 
-#: src/keygendlg.c:197
+#: src/keygendlg.c:192
 msgid "_Key size (bits): "
 msgstr "_Taille de clef (bits): "
 
@@ -1312,27 +1096,27 @@
 msgid "2048"
 msgstr "2048"
 
-#: src/keygendlg.c:216
+#: src/keygendlg.c:206
 msgid "_User ID: "
 msgstr "_ID d'utilisateur: "
 
-#: src/keygendlg.c:226
+#: src/keygendlg.c:217
 msgid "_Email: "
 msgstr "Courri_el: "
 
-#: src/keygendlg.c:236
+#: src/keygendlg.c:226
 msgid "_Comment: "
 msgstr "_Commentaire:"
 
-#: src/keygendlg.c:248
+#: src/keygendlg.c:235
 msgid "_Passphrase: "
 msgstr "Mot de _passe"
 
-#: src/keygendlg.c:260
+#: src/keygendlg.c:246
 msgid "_Repeat passphrase: "
 msgstr "_RÃ©pÃ©ter le mot de passe:"
 
-#: src/keygenwizard.c:152
+#: src/keygenwizard.c:172
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1344,19 +1128,16 @@
 "Votre nom fera partie de la nouvelle clef pour permettre aux autres "
 "d'identifier plus facilement les clefs."
 
-#: src/keygenwizard.c:157
+#: src/keygenwizard.c:175
 msgid "Your Name:"
 msgstr "Votre nom:"
 
-#: src/keygenwizard.c:170
-msgid "Please insert your name"
-msgstr "Veuillez indiquer votre nom"
-
-#: src/keygenwizard.c:183
+#: src/keygenwizard.c:211
+#, fuzzy
 msgid ""
 "Please insert your email address.\n"
 "\n"
-" Your email address will be part of the new key to make it easier for others "
+"Your email address will be part of the new key to make it easier for others "
 "to identify keys. If you have several email addresses, you can add further "
 "email adresses later."
 msgstr ""
@@ -1366,27 +1147,40 @@
 "autres d'identifier plus facilement les clefs. Si vous avez plusieurs "
 "adresses de courriel, vous pourrez en ajouter d'autres plus tard."
 
-#: src/keygenwizard.c:190
+#: src/keygenwizard.c:215
 msgid "Your Email Address:"
 msgstr "Votre adresse courriel:"
 
-#: src/keygenwizard.c:205
-msgid "Please insert your email address"
-msgstr "Veuillez indiquer votre adresse courriel"
-
-#: src/keygenwizard.c:239
+#: src/keygenwizard.c:319
 msgid "Please choose a passphrase for the new key."
 msgstr "Veuillez choisir un mot de passe pour cette nouvelle clef."
 
-#: src/keygenwizard.c:248 src/passwddlg.c:108
+#: src/keygenwizard.c:326
+#, fuzzy
+msgid ""
+"In \"Passphrase\" and \"Repeat passphrase\", you must enter the same "
+"passphrase."
+msgstr ""
+"Dans \"Mot de passe\" et \"RÃ©pÃ©ter le mot de passe\",\n"
+"vous devez entrer le mÃªme mot de passe."
+
+#: src/keygenwizard.c:335
+msgid "Warning: The passphrase you have entered is not very secure."
+msgstr ""
+
+#: src/keygenwizard.c:350
+msgid "Quality: "
+msgstr ""
+
+#: src/keygenwizard.c:358 src/passwddlg.c:111
 msgid "Passphrase: "
 msgstr "Mot de passe: "
 
-#: src/keygenwizard.c:261 src/passwddlg.c:117
+#: src/keygenwizard.c:370 src/passwddlg.c:120
 msgid "Repeat Passphrase: "
 msgstr "RÃ©pÃ©ter le mot de passe: "
 
-#: src/keygenwizard.c:358
+#: src/keygenwizard.c:412
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1398,15 +1192,15 @@
 "\n"
 "Voulez-vous crÃ©er une copie de sauvegarde?"
 
-#: src/keygenwizard.c:367
+#: src/keygenwizard.c:420
 msgid "Create _backup copy"
 msgstr "CrÃ©er une _copie de sauvegarde"
 
-#: src/keygenwizard.c:374 src/keyring.c:739 src/keyring.c:767
+#: src/keygenwizard.c:425 src/keyring.c:737 src/keyring.c:763
 msgid "Do it _later"
 msgstr "Le faire plus _tard"
 
-#: src/keygenwizard.c:402
+#: src/keygenwizard.c:454
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1417,7 +1211,7 @@
 "MÃªme sur des ordinateurs rapides, cela peut prendre un moment. Merci de "
 "patienter."
 
-#: src/keygenwizard.c:411
+#: src/keygenwizard.c:463
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1437,29 +1231,29 @@
 "GnuPG met Ã  jour les donnÃ©es de confiance.\n"
 "Ceci peut prendre quelques secondes."
 
-#: src/keylist.c:559
+#: src/keylist.c:547
 msgid ""
 "This columns lists the type of the certificate.  A 'P' denotes OpenPGP and a "
 "'X' denotes X.509 (S/MIME)."
 msgstr ""
 
-#: src/keylist.c:568
+#: src/keylist.c:556
 msgid "The key ID is a short number to identify a certificate."
 msgstr ""
 "L'identificateur de clef est une suite de chiffres et de lettres servant Ã  "
 "identifier un certificat."
 
-#: src/keylist.c:581
+#: src/keylist.c:569
 msgid "The Expiry Date is the date until the certificate is valid."
 msgstr ""
 "La date d'expiration indique la date Ã  laquelle le certificat cesse d'Ãªtre "
 "valide."
 
-#: src/keylist.c:591 src/ownertrustdlg.c:122
+#: src/keylist.c:579 src/ownertrustdlg.c:123
 msgid "Owner Trust"
 msgstr "Confiance du propriÃ©taire"
 
-#: src/keylist.c:592
+#: src/keylist.c:580
 msgid ""
 "The Owner Trust has been set by you and describes how far you trust the "
 "holder of the certificate to correctly sign (certify) other certificates.  "
@@ -1469,11 +1263,11 @@
 "confiance que vous apportez au dÃ©tenteur du certificat lorsqu'il signe "
 "(certifie) d'autres certificats. Ceci n'est tenu en compte que par OpenPGP."
 
-#: src/keylist.c:604
+#: src/keylist.c:592
 msgid "Validity"
 msgstr "ValiditÃ©"
 
-#: src/keylist.c:605
+#: src/keylist.c:593
 msgid ""
 "The Validity describes the trust level the system has in this certificate.  "
 "That is how sure it is that the named user is actually that user."
@@ -1482,7 +1276,7 @@
 "certificat. Ceci indique le niveau de certitude concernant l'identitÃ© de cet "
 "utilisateur."
 
-#: src/keylist.c:619
+#: src/keylist.c:607
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
@@ -1493,7 +1287,7 @@
 msgid "No keys selected for signing."
 msgstr "Aucune clef sÃ©lectionnÃ©e pour signer."
 
-#: src/keyring.c:734
+#: src/keyring.c:732
 msgid ""
 "You do not have a private key yet. Do you want to generate one now "
 "(recommended) or do it later?"
@@ -1501,11 +1295,11 @@
 "Vous n'avez pas encore de clef privÃ©e. Voulez-vous en gÃ©nÃ©rer une maintenant "
 "(recommendÃ©) ou le faire plus tard?"
 
-#: src/keyring.c:738
+#: src/keyring.c:736
 msgid "_Generate key now"
 msgstr "_GÃ©nÃ©rer la clef maintenant"
 
-#: src/keyring.c:761
+#: src/keyring.c:757
 msgid ""
 "You do not have a backup copy of your private key yet. Do you want to backup "
 "your key now (recommended) or do it later?"
@@ -1513,335 +1307,244 @@
 "Vous n'avez pas encore de sauvegarde de votre clef privÃ©e. Voulez-vous faire "
 "une sauvegarde maintenant (recommendÃ©) ou le faire plus tard ?"
 
-#: src/keyring.c:766
+#: src/keyring.c:762
 msgid "_Backup key now"
 msgstr "_Sauvegarder la clef maintenant"
 
-#: src/keyring.c:883
-msgid "/_Keys"
+#: src/keyring.c:886
+#, fuzzy
+msgid "_Keys"
 msgstr "/_Clefs"
 
-#: src/keyring.c:884
-msgid "/Keys/_Refresh"
-msgstr "/Clefs/_Recharger"
-
-#: src/keyring.c:886
-msgid "/Keys/sep0"
-msgstr "/Clefs/sep0"
-
 #: src/keyring.c:887
-msgid "/Keys/_New Key..."
-msgstr "/Clefs/_Nouvelle Clef..."
+#, fuzzy
+msgid "_Server"
+msgstr "/_Serveur"
 
-#: src/keyring.c:889
-msgid "/Keys/_Delete Keys..."
-msgstr "/Clefs/Supprimer Clefs..."
+#: src/keyring.c:901
+msgid "Select all certificates"
+msgstr ""
 
-#: src/keyring.c:891
-msgid "/Keys/sep1"
-msgstr "/Clefs/sep1"
+#: src/keyring.c:906
+msgid "Refresh the keyring"
+msgstr "Recharger le trousseau de clefs"
 
-#: src/keyring.c:892
-msgid "/Keys/_Sign Keys..."
-msgstr "/Clefs/_Signature de Clefs..."
+#: src/keyring.c:907
+#, fuzzy
+msgid "_New key..."
+msgstr "/Clefs/_Nouvelle Clef..."
 
-#: src/keyring.c:893
-msgid "/Keys/Set _Owner Trust..."
-msgstr "/Clefs/Changer la confiance..."
+#: src/keyring.c:908
+#, fuzzy
+msgid "Generate a new key"
+msgstr "GÃ©nÃ©rer clef"
 
-#: src/keyring.c:894
-msgid "/Keys/_Edit Private Key..."
-msgstr "/Clefs/_Ã‰dition de clef privÃ©e..."
+#: src/keyring.c:909
+#, fuzzy
+msgid "_Delete keys"
+msgstr "/Supprimer des Clefs..."
 
-#: src/keyring.c:895
-msgid "/Keys/sep2"
-msgstr "/Clefs/sep2"
+#: src/keyring.c:910
+msgid "Remove the selected key"
+msgstr "Supprimer la clef sÃ©lectionnÃ©e"
 
-#: src/keyring.c:896
-msgid "/Keys/_Import Keys..."
-msgstr "/Clefs/_Importer des Clefs..."
+#: src/keyring.c:911
+#, fuzzy
+msgid "_Sign Keys..."
+msgstr "/_Signature de Clefs..."
 
-#: src/keyring.c:897
-msgid "/Keys/E_xport Keys..."
-msgstr "/Clefs/E_xporter des Clefs..."
+#: src/keyring.c:912
+msgid "Sign the selected key"
+msgstr "Signer la clef sÃ©lectionnÃ©e"
 
-#: src/keyring.c:898
-msgid "/Keys/_Backup..."
-msgstr "/Clefs/_Sauvegarder..."
+#: src/keyring.c:913
+#, fuzzy
+msgid "Set _Owner Trust..."
+msgstr "/Changer la confiance..."
 
-#: src/keyring.c:901
-msgid "/_Server"
-msgstr "/_Serveur"
+#: src/keyring.c:914
+#, fuzzy
+msgid "Set owner trust of the selected key"
+msgstr "Supprimer la clef sÃ©lectionnÃ©e"
 
-#: src/keyring.c:902
-msgid "/Server/_Retrieve Keys..."
-msgstr "/Serveur/_RÃ©cupÃ©ration de Clefs..."
+#: src/keyring.c:916
+#, fuzzy
+msgid "_Edit Private Key..."
+msgstr "/_Ã‰diter une Clef PrivÃ©e..."
 
-#: src/keyring.c:903
-msgid "/Server/_Send Keys..."
-msgstr "/Serveur/_Envoi de Clefs..."
+#: src/keyring.c:917
+msgid "Edit the selected private key"
+msgstr "Editer la clef sÃ©lectionnÃ©e"
 
-#: src/keyring.c:908
-msgid "/Windows/_File Manager"
-msgstr "/FenÃªtres/_Gestionnaire de fichiers"
+#: src/keyring.c:919
+#, fuzzy
+msgid "_Import Keys..."
+msgstr "Importer des clefs"
 
-#: src/keyring.c:939
-msgid "/Keys/Export Keys..."
-msgstr "/Clefs/_Exporter des Clefs..."
+#: src/keyring.c:920
+msgid "Import Keys"
+msgstr "Importer des clefs"
 
-#: src/keyring.c:944
-msgid "/Keys/Delete Keys..."
-msgstr "/Clefs/_Supprimer des Clefs..."
+#: src/keyring.c:921
+#, fuzzy
+msgid "E_xport Keys..."
+msgstr "/E_xporter des Clefs..."
 
-#: src/keyring.c:952
-msgid "/Server/Send Keys..."
-msgstr "/Clefs/_Envoi de Clefs..."
+#: src/keyring.c:922
+msgid "Export Keys"
+msgstr "Exporter des clefs"
 
-#: src/keyring.c:959
-msgid "/Keys/Set Owner Trust..."
-msgstr "/Clefs/Changer la confiance..."
+#: src/keyring.c:923
+#, fuzzy
+msgid "_Backup..."
+msgstr "/_Sauvegarder..."
 
-#: src/keyring.c:966
-msgid "/Keys/Sign Keys..."
-msgstr "/Clefs/Signature de clefs..."
+#: src/keyring.c:924
+#, fuzzy
+msgid "Backup key"
+msgstr "Sauvegarde des clÃ©s"
 
-#: src/keyring.c:972
-msgid "/Keys/Edit Private Key..."
-msgstr "/Clefs/Ã‰dition de Clef PrivÃ©e..."
+#: src/keyring.c:927
+#, fuzzy
+msgid "_Retrieve Keys..."
+msgstr "/Serveur/_RÃ©cupÃ©ration de Clefs..."
 
-#: src/keyring.c:977
-msgid "/Keys/Backup..."
-msgstr "/Clefs/Sauvegarder..."
+#: src/keyring.c:928
+msgid "Retrieve keys from server"
+msgstr ""
 
-#: src/keyring.c:994
-msgid "/_Copy"
-msgstr "/Ã‰dition/_Copier"
-
-#: src/keyring.c:996
-msgid "/_Paste"
-msgstr "/Ã‰dition/_Coller"
-
-#: src/keyring.c:998
-msgid "/_Delete Keys..."
-msgstr "/Supprimer des Clefs..."
-
-#: src/keyring.c:1001
-msgid "/_Sign Keys..."
+#: src/keyring.c:930
+#, fuzzy
+msgid "_Send Keys..."
 msgstr "/_Signature de Clefs..."
 
-#: src/keyring.c:1002
-msgid "/Set _Owner Trust..."
-msgstr "/Changer la confiance..."
+#: src/keyring.c:931
+#, fuzzy
+msgid "Send keys to server"
+msgstr "/E_nvoi de Clefs au Serveur..."
 
-#: src/keyring.c:1003
-msgid "/_Edit Private Key..."
-msgstr "/_Ã‰diter une Clef PrivÃ©e..."
+#: src/keyring.c:937
+msgid "Show Brief Keylist"
+msgstr "Montrer un rÃ©sumÃ© de la liste de clefs"
 
-#: src/keyring.c:1005
-msgid "/E_xport Keys..."
-msgstr "/E_xporter des Clefs..."
+#: src/keyring.c:939
+msgid "Show Key Details"
+msgstr "Montrer les dÃ©tails de la clef"
 
-#: src/keyring.c:1006
-msgid "/Se_nd Keys to Server..."
-msgstr "/E_nvoi de Clefs au Serveur..."
+#: src/keyring.c:1063
+msgid "Edit"
+msgstr "Ã‰diter"
 
-#: src/keyring.c:1007
-msgid "/_Backup..."
-msgstr "/_Sauvegarder..."
+#: src/keyring.c:1065
+#, fuzzy
+msgid "Delete"
+msgstr "/Edition/Effacer"
 
-#: src/keyring.c:1018
-msgid "/Set Owner Trust..."
-msgstr "/Changer la confiance..."
+#: src/keyring.c:1067
+msgid "Sign"
+msgstr "Signer"
 
-#: src/keyring.c:1025
-msgid "/Sign Keys..."
-msgstr "/Signature de Clefs..."
+#: src/keyring.c:1069
+msgid "Export"
+msgstr "Exporter"
 
-#: src/keyring.c:1031
-msgid "/Edit Private Key..."
-msgstr "/Ã‰dition de Clefs PrivÃ©es..."
+#: src/keyring.c:1071
+msgid "Import"
+msgstr "Importer"
 
-#: src/keyring.c:1036
-msgid "/Backup..."
-msgstr "/Sauvegarder..."
-
-#: src/keyring.c:1106
+#: src/keyring.c:1178
 msgid "Subkeys"
 msgstr "Sous-clefs"
 
-#: src/keyring.c:1180 src/keysigndlg.c:110
+#: src/keyring.c:1252 src/keysigndlg.c:106
 msgid "Fingerprint:"
 msgstr "Empreinte:"
 
-#: src/keyring.c:1182
+#: src/keyring.c:1254
 msgid "Expires at:"
 msgstr "Expire le:"
 
-#: src/keyring.c:1184
+#: src/keyring.c:1256
 msgid "Owner Trust:"
 msgstr "Confiance du propriÃ©taire:"
 
-#: src/keyring.c:1186
+#: src/keyring.c:1258
 msgid "Key Validity:"
 msgstr "ValiditÃ©:"
 
-#: src/keyring.c:1188
+#: src/keyring.c:1260
 msgid "Key Type:"
 msgstr "Type de clef:"
 
-#: src/keyring.c:1190
+#: src/keyring.c:1262
 msgid "Created at:"
 msgstr "CrÃ©Ã©e le:"
 
-#: src/keyring.c:1193
+#: src/keyring.c:1265
 msgid "Details"
 msgstr "DÃ©tails"
 
-#: src/keyring.c:1201
+#: src/keyring.c:1273
 msgid "Show signatures on user name:"
 msgstr "Afficher les signatures d'un nom d'usager:"
 
-#: src/keyring.c:1225
+#: src/keyring.c:1298
 msgid "Signatures"
 msgstr "Signatures"
 
-#: src/keyring.c:1249
+#: src/keyring.c:1322
 msgid "The key has both a private and a public part"
 msgstr "La clef a Ã  la fois une partie privÃ©e et une partie publique"
 
-#: src/keyring.c:1252
+#: src/keyring.c:1325
 msgid "The key has only a public part"
 msgstr "La clef a seulement une partie publique"
 
-#: src/keyring.c:1287
+#: src/keyring.c:1360
 #, c-format
 msgid "%s %u bits"
 msgstr "%s %u bits"
 
-#: src/keyring.c:1312
+#: src/keyring.c:1385
 msgid "No keys selected"
 msgstr "Pas de clef sÃ©lectionnÃ©e"
 
-#: src/keyring.c:1315
+#: src/keyring.c:1388
 #, c-format
 msgid "%d key selected"
 msgid_plural "%d keys selected"
 msgstr[0] "%d clef sÃ©lectionnÃ©e"
 msgstr[1] "%d clefs sÃ©lectionnÃ©es"
 
-#: src/keyring.c:1347
+#: src/keyring.c:1423
 msgid "All signatures"
 msgstr "Toutes les signatures"
 
-#: src/keyring.c:1552
-msgid "Edit"
-msgstr "Ã‰diter"
-
-#: src/keyring.c:1553
-msgid "Edit the selected private key"
-msgstr "Editer la clef sÃ©lectionnÃ©e"
-
-#: src/keyring.c:1554
-msgid "edit key"
-msgstr "Ã©diter clef"
-
-#: src/keyring.c:1562
-msgid "Remove the selected key"
-msgstr "Supprimer la clef sÃ©lectionnÃ©e"
-
-#: src/keyring.c:1563
-msgid "remove key"
-msgstr "supprimer clef"
-
-#: src/keyring.c:1571
-msgid "Sign the selected key"
-msgstr "Signer la clef sÃ©lectionnÃ©e"
-
-#: src/keyring.c:1571
-msgid "sign key"
-msgstr "signer clef"
-
 #: src/keyring.c:1578
-msgid "Import"
-msgstr "Importer"
-
-#: src/keyring.c:1579
-msgid "Import Keys"
-msgstr "Importer des clefs"
-
-#: src/keyring.c:1579
-msgid "import keys"
-msgstr "importer clefs"
-
-#: src/keyring.c:1584
-msgid "Export"
-msgstr "Exporter"
-
-#: src/keyring.c:1585
-msgid "Export Keys"
-msgstr "Exporter des clefs"
-
-#: src/keyring.c:1585
-msgid "export keys"
-msgstr "exporter clefs"
-
-#: src/keyring.c:1598
-msgid "Brief"
-msgstr "RÃ©sumÃ©e"
-
-#: src/keyring.c:1598
-msgid "Show Brief Keylist"
-msgstr "Montrer un rÃ©sumÃ© de la liste de clefs"
-
-#: src/keyring.c:1599
-msgid "brief"
-msgstr "rÃ©sumÃ©e"
-
-#: src/keyring.c:1610
-msgid "Detailed"
-msgstr "DÃ©taillÃ©e"
-
-#: src/keyring.c:1610
-msgid "Show Key Details"
-msgstr "Montrer les dÃ©tails de la clef"
-
-#: src/keyring.c:1611
-msgid "detailed"
-msgstr "dÃ©taillÃ©"
-
-#: src/keyring.c:1639
-msgid "Refresh the keyring"
-msgstr "Recharger le trousseau de clefs"
-
-#: src/keyring.c:1640
-msgid "refresh keyring"
-msgstr "Recharger le trousseau de clefs"
-
-#: src/keyring.c:1711
 msgid "Selected default key:"
 msgstr "Clef sÃ©lectionnÃ©e par dÃ©faut:"
 
-#: src/keyring.c:1721
+#: src/keyring.c:1588
 msgid "No default key selected in the preferences."
 msgstr "Aucune clef sÃ©lectionnÃ©e par dÃ©faut dans les prÃ©fÃ©rences"
 
-#: src/keyring.c:1833
+#: src/keyring.c:1701
 msgid "GNU Privacy Assistant - Keyring Editor"
 msgstr "GNU Privacy Assistant - Ã‰diteur de trousseau de clefs"
 
-#: src/keyring.c:1865
+#: src/keyring.c:1728
 msgid "Keyring Editor"
 msgstr "Ã‰diteur de trousseau de clefs"
 
-#: src/keysigndlg.c:60
+#: src/keysigndlg.c:59
 msgid "Sign Key"
 msgstr "Signer clef"
 
-#: src/keysigndlg.c:76
+#: src/keysigndlg.c:72
 msgid "Do you want to sign the following key?"
 msgstr "Voulez-vous signer cette clef ?"
 
-#: src/keysigndlg.c:120
+#: src/keysigndlg.c:116
 msgid ""
 "Check the name and fingerprint carefully to be sure that it really is the "
 "key you want to sign."
@@ -1849,19 +1552,19 @@
 "VÃ©rifiez le nom et l'empreinte mÃ©ticuleusement pour Ãªtre sÃ»r que c'est "
 "rÃ©ellement la clef que vous voulez signer."
 
-#: src/keysigndlg.c:128
+#: src/keysigndlg.c:124
 msgid "All user names in this key will be signed."
 msgstr "Tous les noms d'utilisateur dans cette clef seront signÃ©s"
 
-#: src/keysigndlg.c:134
+#: src/keysigndlg.c:130
 msgid "The key will be signed with your default private key."
 msgstr "La clef sera signÃ©e avec votre clef privÃ©e par dÃ©faut"
 
-#: src/keysigndlg.c:141
+#: src/keysigndlg.c:137
 msgid "Sign only _locally"
 msgstr "Signer seulement en _local"
 
-#: src/options.c:312
+#: src/options.c:323
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -1869,26 +1572,26 @@
 "La clef privÃ©e que vous avez configurÃ©e par dÃ©faut n'est plus disponible.\n"
 "GPA tentera d'en choisir une autre automatiquement."
 
-#: src/ownertrustdlg.c:106
+#: src/ownertrustdlg.c:107
 msgid "Change key ownertrust"
 msgstr "Changer la confiance dans la clef"
 
-#: src/ownertrustdlg.c:130
+#: src/ownertrustdlg.c:131
 msgid "_Unknown"
 msgstr "Inconn_ue"
 
-#: src/ownertrustdlg.c:135
+#: src/ownertrustdlg.c:136
 msgid ""
 "You don't know how much to trust this user to verify other people's keys.\n"
 msgstr ""
 "Vous ne savez pas quelle confiance accorder Ã  cet utilisateur pour vÃ©rifier "
 "la clef des autres.\n"
 
-#: src/ownertrustdlg.c:145
+#: src/ownertrustdlg.c:146
 msgid "_Never"
 msgstr "_Jamais"
 
-#: src/ownertrustdlg.c:150
+#: src/ownertrustdlg.c:151
 msgid ""
 "You don't trust this user at all to verify the validity of other people's "
 "keys at all.\n"
@@ -1896,11 +1599,11 @@
 "Vous ne faÃ®tes pas confiance du tout Ã  cet utilisateur pour vÃ©rifier la "
 "validitÃ© de la clef des autres\n"
 
-#: src/ownertrustdlg.c:160
+#: src/ownertrustdlg.c:161
 msgid "_Marginal"
 msgstr "_Marginale"
 
-#: src/ownertrustdlg.c:165
+#: src/ownertrustdlg.c:166
 msgid ""
 "You don't trust this user's ability to verify the validity of other people's "
 "keys enough to consider keys valid based on his/her sole word.\n"
@@ -1916,11 +1619,11 @@
 "aussi Ã©tÃ© signÃ©e au moins par deux utilisateurs auxquels vous accordez une "
 "confiance marginale et ayant des clefs valides\n"
 
-#: src/ownertrustdlg.c:182
+#: src/ownertrustdlg.c:183
 msgid "_Full"
 msgstr "_ComplÃ¨te"
 
-#: src/ownertrustdlg.c:187
+#: src/ownertrustdlg.c:188
 msgid ""
 "You trust this user's ability to verify the validity of other people's keys "
 "so much, that you'll consider valid any key signed by him/her, provided this "
@@ -1930,11 +1633,11 @@
 "la validitÃ© de la clef des autres personnes, que vous considÃ©rerez comme "
 "valide toute clef signÃ©e par lui/elle, pour peu que la clef soit valide\n"
 
-#: src/ownertrustdlg.c:200
+#: src/ownertrustdlg.c:201
 msgid "U_ltimate"
 msgstr "U_ltime"
 
-#: src/ownertrustdlg.c:205
+#: src/ownertrustdlg.c:206
 msgid ""
 "You consider this key valid, and trust the user so much that you will "
 "consider any key signed by him/her fully valid.\n"
@@ -2026,34 +1729,145 @@
 "Il n'y a aucun plugin disponible pour le protocole de\n"
 "serveur de clefs que vous avez spÃ©cifiÃ©."
 
-#: src/server_access.c:528 src/server_access.c:574
+#: src/server_access.c:528 src/server_access.c:572
 msgid "The keyserver you specified is not valid"
 msgstr "Le serveur de clefs que vous avez indiquÃ© n'est pas valide"
 
-#: src/settingsdlg.c:59
+#: src/settingsdlg.c:133 src/siglist.c:135
+msgid "Local"
+msgstr "Local"
+
+#: src/settingsdlg.c:134
+msgid "Local, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:135
+#, fuzzy
+msgid "Local, PKA"
+msgstr "Local"
+
+#: src/settingsdlg.c:136
+msgid "Local, PKA, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:137
+msgid "Local, Keyserver, PKA"
+msgstr ""
+
+#: src/settingsdlg.c:138
+#, fuzzy
+msgid "Local, kDNS"
+msgstr "Local"
+
+#: src/settingsdlg.c:139
+msgid "Local, kDNS, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:140
+msgid "PKA"
+msgstr ""
+
+#: src/settingsdlg.c:141
+msgid "kDNS"
+msgstr ""
+
+#: src/settingsdlg.c:142
+msgid "Custom"
+msgstr ""
+
+#: src/settingsdlg.c:208
+#, fuzzy
+msgid "<b>User interface</b>"
+msgstr "<b>Utiliser le mode _avancÃ©</b>"
+
+#: src/settingsdlg.c:215
+#, fuzzy
+msgid "Use _advanced mode"
+msgstr "<b>Utiliser le mode _avancÃ©</b>"
+
+#: src/settingsdlg.c:221
+msgid "Show advanced _options"
+msgstr ""
+
+#: src/settingsdlg.c:272
+msgid ""
+"No default key has been selected.  This may lead to problems when signing or "
+"encrypting.  For example you might later not be able to read a mail written "
+"by you and encrypted to someone else.\n"
+"\n"
+"Please consider creating your own key and select it then."
+msgstr ""
+
+#: src/settingsdlg.c:278
+msgid "Continue without a default key"
+msgstr ""
+
+#: src/settingsdlg.c:280
+#, fuzzy
+msgid "Let me select a default key"
+msgstr "Clef sÃ©lectionnÃ©e par dÃ©faut:"
+
+#: src/settingsdlg.c:305
 msgid "<b>Default _key</b>"
 msgstr "<b>Clef par _dÃ©faut</b>"
 
-#: src/settingsdlg.c:111
+#: src/settingsdlg.c:405
 msgid "<b>Default key_server</b>"
 msgstr "<b>_Serveur de clefs par dÃ©faut</b>"
 
-#: src/settingsdlg.c:158
-msgid "<b>Use _advanced mode</b>"
-msgstr "<b>Utiliser le mode _avancÃ©</b>"
+#: src/settingsdlg.c:602
+#, fuzzy
+msgid "<b>Auto key _locate</b>"
+msgstr "<b>_Serveur de clefs par dÃ©faut</b>"
 
-#: src/settingsdlg.c:193
-msgid "Settings"
-msgstr "RÃ©glages"
+#: src/settingsdlg.c:612
+msgid ""
+"The list of methods to locate keys via an email address.\n"
+"All given methods are used in turn until a matching key is found.  The "
+"supported methods are:\n"
+" Local\n"
+"   - Use the local keyring.\n"
+" Keyserver\n"
+"   - Use the default keyserver.\n"
+" PKA\n"
+"   - Use the Public Key Association.\n"
+" kDNS\n"
+"   - Use kDNS with the nameserver below.\n"
+" Custom\n"
+"   - Configured in the backend dialog.\n"
+msgstr ""
 
+#: src/settingsdlg.c:627
+msgid "Method:"
+msgstr ""
+
+#: src/settingsdlg.c:644
+msgid "The IP address of the nameserver used for the kDNS method."
+msgstr ""
+
+#: src/settingsdlg.c:646
+#, fuzzy
+msgid "kDNS Server:"
+msgstr "/_Serveur"
+
+#: src/settingsdlg.c:740
+#, fuzzy
+msgid "The URL given for the keyserver is not valid."
+msgstr "Le serveur de clefs que vous avez indiquÃ© n'est pas valide"
+
+#: src/settingsdlg.c:749
+msgid "The data given for \"Auto key locate\" is not valid."
+msgstr ""
+
+#: src/settingsdlg.c:886
+#, fuzzy
+msgid "GNU Privacy Assistant - Settings"
+msgstr "GNU Privacy Assistant - Ã‰diteur de trousseau de clefs"
+
 #: src/siglist.c:128
 msgid "Level"
 msgstr "Niveau"
 
-#: src/siglist.c:135
-msgid "Local"
-msgstr "Local"
-
 #: src/verifydlg.c:116
 msgid "Verify documents"
 msgstr "VÃ©rification de documents"
@@ -2080,9 +1894,336 @@
 msgid "Signatures:"
 msgstr "Signatures:"
 
-#~ msgid "Backup Keys"
-#~ msgstr "Sauvegarde des clÃ©s"
+#~ msgid "/File/C_lear"
+#~ msgstr "/Fichier/_Remise Ã  zÃ©ro"
 
+#~ msgid "/File/_Open"
+#~ msgstr "/Fichier/_Ouvrir"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Fichier/Enregistrer sous..."
+
+#~ msgid "/File/sep1"
+#~ msgstr "/Fichier/sep1"
+
+#~ msgid "/File/_Sign"
+#~ msgstr "/Fichier/_Signer"
+
+#~ msgid "/File/_Verify"
+#~ msgstr "/Fichier/_VÃ©rifier"
+
+#~ msgid "/File/_Encrypt"
+#~ msgstr "/Fichier/_Chiffrer"
+
+#~ msgid "/File/_Decrypt"
+#~ msgstr "/Fichier/_DÃ©chiffrer"
+
+#~ msgid "/File/sep2"
+#~ msgstr "/Fichier/sep2"
+
+#~ msgid "/File/_Close"
+#~ msgstr "/Fichier/_Fermer"
+
+#~ msgid "/File/_Quit"
+#~ msgstr "/Fichier/_Quitter"
+
+#~ msgid "/Edit/_Undo"
+#~ msgstr "/Ã‰dition/Ann_uler"
+
+#~ msgid "/Edit/_Redo"
+#~ msgstr "/Ã‰dition/_Refaire"
+
+#~ msgid "/Edit/sep0"
+#~ msgstr "/Ã‰dition/sep02"
+
+#~ msgid "/Edit/Cut"
+#~ msgstr "/Ã‰dition/Couper"
+
+#~ msgid "/Edit/_Copy"
+#~ msgstr "/Ã‰dition/_Copier"
+
+#~ msgid "/Edit/_Paste"
+#~ msgstr "/Ã‰dition/_Coller"
+
+#~ msgid "/Edit/_Delete"
+#~ msgstr "/Ã‰dition/_Effacer"
+
+#~ msgid "/Edit/sep1"
+#~ msgstr "/Ã‰dition/sep1"
+
+#~ msgid "/Edit/Select _All"
+#~ msgstr "/Ã‰dition/SÃ©lectionner _Tout"
+
+#~ msgid "/Edit/sep2"
+#~ msgstr "/Ã‰dition/sep2"
+
+#~ msgid "/Edit/Pr_eferences..."
+#~ msgstr "/Ã‰dition/PrÃ©fÃ©r_ences..."
+
+#~ msgid "/Edit/_Backend Preferences..."
+#~ msgstr "/Ã‰dition/PrÃ©fÃ©rences _Backend..."
+
+#~ msgid "/_Windows"
+#~ msgstr "/_FenÃªtres"
+
+#~ msgid "/Windows/_Keyring Editor"
+#~ msgstr "/FenÃªtres/_Editeur de trousseau"
+
+#~ msgid "/Windows/_Filemanager"
+#~ msgstr "/FenÃªtres/Gestionnaire de _fichiers"
+
+#~ msgid "/Windows/_Clipboard"
+#~ msgstr "/FenÃªtres/_Presse-papiers"
+
+#~ msgid "/Edit/Copy"
+#~ msgstr "/Edition/Copier"
+
+#~ msgid "/Edit/Paste"
+#~ msgstr "/Edition/_Coller"
+
+#~ msgid "clear buffer"
+#~ msgstr "effacer tampon"
+
+#~ msgid "open file"
+#~ msgstr "ouvrir fichier"
+
+#~ msgid "save file as"
+#~ msgstr "enregistrer le fichier _comme"
+
+#~ msgid "cut the selection"
+#~ msgstr "couper la sÃ©lection"
+
+#~ msgid "copy the selection"
+#~ msgstr "copier la sÃ©lection"
+
+#~ msgid "paste the clipboard"
+#~ msgstr "coller le presse-papiers"
+
+#~ msgid "Sign the selected text"
+#~ msgstr "Signer le texte sÃ©lectionnÃ©"
+
+#~ msgid "verify text"
+#~ msgstr "vÃ©rifier texte"
+
+#~ msgid "encrypt text"
+#~ msgstr "chiffrer texte"
+
+#~ msgid "decrypt text"
+#~ msgstr "dÃ©chiffrer texte"
+
+#~ msgid "preferences"
+#~ msgstr "prÃ©fÃ©rences"
+
+#~ msgid "Open the keyring editor"
+#~ msgstr "Ouvrir l'Ã©diteur de trousseau de clefs"
+
+#~ msgid "keyring editor"
+#~ msgstr "Ã©diteur de trousseau de clefs"
+
+#~ msgid "Open the file manager"
+#~ msgstr "Ouvrir le gestionnaire de fichiers"
+
+#~ msgid "file manager"
+#~ msgstr "/FenÃªtres/_Gestionnaire de fichier"
+
+#~ msgid "Help"
+#~ msgstr "Aide"
+
+#~ msgid "help"
+#~ msgstr "aide"
+
+#~ msgid "/File/Sign"
+#~ msgstr "/Fichier/_Signer"
+
+#~ msgid "/File/Verify"
+#~ msgstr "/Fichier/VÃ©rifier"
+
+#~ msgid "/File/Encrypt"
+#~ msgstr "/Fichier/_Chiffrer"
+
+#~ msgid "/File/Decrypt"
+#~ msgstr "/Fichier/_DÃ©chiffrer"
+
+#~ msgid "close files"
+#~ msgstr "fermer fichiers"
+
+#~ msgid "sign file"
+#~ msgstr "signer fichier"
+
+#~ msgid "verify file"
+#~ msgstr "vÃ©rifier fichier"
+
+#~ msgid "encrypt file"
+#~ msgstr "chiffrer fichier"
+
+#~ msgid "decrypt file"
+#~ msgstr "dÃ©chiffrer fichier"
+
+#~ msgid "Open the clipboard"
+#~ msgstr "Ouvrir le presse-papiers"
+
+#~ msgid "clipboard"
+#~ msgstr "presse-papiers"
+
+#~ msgid "_Back"
+#~ msgstr "_Revenir"
+
+#~ msgid "_Forward"
+#~ msgstr "_Continuer"
+
+#~ msgid "_Apply"
+#~ msgstr "_Appliquer"
+
+#~ msgid "Brought to you by:"
+#~ msgstr "Vous est fourni par:"
+
+#~ msgid "GPA is Free Software under the"
+#~ msgstr "GPA est un logiciel libre distribuÃ©"
+
+#~ msgid "GNU General Public License."
+#~ msgstr "sous License GÃ©nÃ©rale Publique GNU."
+
+#~ msgid "For news see:"
+#~ msgstr "Pour des nouvelles, voir:"
+
+#~ msgid "http://www.gpg4win.org"
+#~ msgstr "http://www.gpg4win.org"
+
+#~ msgid "http://www.gnupg.org"
+#~ msgstr "http://www.gnupg.org"
+
+#~ msgid "GNU General Public License"
+#~ msgstr "GNU General Gublic License"
+
+#~ msgid "_GNU General Public License"
+#~ msgstr "GNU general public license"
+
+#~ msgid "Show Help Text\n"
+#~ msgstr "Montrer le texte d'aide\n"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Aide"
+
+#~ msgid "/Help/_Contents"
+#~ msgstr "/Aide/_Contenu"
+
+#~ msgid "/Help/_License"
+#~ msgstr "/Aide/_Licence"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/Aide/_Ã€ propos"
+
+#~ msgid "Please insert your name"
+#~ msgstr "Veuillez indiquer votre nom"
+
+#~ msgid "Please insert your email address"
+#~ msgstr "Veuillez indiquer votre adresse courriel"
+
+#~ msgid "/Keys/_Refresh"
+#~ msgstr "/Clefs/_Recharger"
+
+#~ msgid "/Keys/sep0"
+#~ msgstr "/Clefs/sep0"
+
+#~ msgid "/Keys/_Delete Keys..."
+#~ msgstr "/Clefs/Supprimer Clefs..."
+
+#~ msgid "/Keys/sep1"
+#~ msgstr "/Clefs/sep1"
+
+#~ msgid "/Keys/_Sign Keys..."
+#~ msgstr "/Clefs/_Signature de Clefs..."
+
+#~ msgid "/Keys/Set _Owner Trust..."
+#~ msgstr "/Clefs/Changer la confiance..."
+
+#~ msgid "/Keys/_Edit Private Key..."
+#~ msgstr "/Clefs/_Ã‰dition de clef privÃ©e..."
+
+#~ msgid "/Keys/sep2"
+#~ msgstr "/Clefs/sep2"
+
+#~ msgid "/Keys/_Import Keys..."
+#~ msgstr "/Clefs/_Importer des Clefs..."
+
+#~ msgid "/Keys/E_xport Keys..."
+#~ msgstr "/Clefs/E_xporter des Clefs..."
+
+#~ msgid "/Keys/_Backup..."
+#~ msgstr "/Clefs/_Sauvegarder..."
+
+#~ msgid "/Server/_Send Keys..."
+#~ msgstr "/Serveur/_Envoi de Clefs..."
+
+#~ msgid "/Windows/_File Manager"
+#~ msgstr "/FenÃªtres/_Gestionnaire de fichiers"
+
+#~ msgid "/Keys/Export Keys..."
+#~ msgstr "/Clefs/_Exporter des Clefs..."
+
+#~ msgid "/Keys/Delete Keys..."
+#~ msgstr "/Clefs/_Supprimer des Clefs..."
+
+#~ msgid "/Server/Send Keys..."
+#~ msgstr "/Clefs/_Envoi de Clefs..."
+
+#~ msgid "/Keys/Set Owner Trust..."
+#~ msgstr "/Clefs/Changer la confiance..."
+
+#~ msgid "/Keys/Sign Keys..."
+#~ msgstr "/Clefs/Signature de clefs..."
+
+#~ msgid "/Keys/Edit Private Key..."
+#~ msgstr "/Clefs/Ã‰dition de Clef PrivÃ©e..."
+
+#~ msgid "/Keys/Backup..."
+#~ msgstr "/Clefs/Sauvegarder..."
+
+#~ msgid "/_Copy"
+#~ msgstr "/Ã‰dition/_Copier"
+
+#~ msgid "/_Paste"
+#~ msgstr "/Ã‰dition/_Coller"
+
+#~ msgid "/Set Owner Trust..."
+#~ msgstr "/Changer la confiance..."
+
+#~ msgid "/Sign Keys..."
+#~ msgstr "/Signature de Clefs..."
+
+#~ msgid "/Edit Private Key..."
+#~ msgstr "/Ã‰dition de Clefs PrivÃ©es..."
+
+#~ msgid "/Backup..."
+#~ msgstr "/Sauvegarder..."
+
+#~ msgid "edit key"
+#~ msgstr "Ã©diter clef"
+
+#~ msgid "remove key"
+#~ msgstr "supprimer clef"
+
+#~ msgid "sign key"
+#~ msgstr "signer clef"
+
+#~ msgid "import keys"
+#~ msgstr "importer clefs"
+
+#~ msgid "export keys"
+#~ msgstr "exporter clefs"
+
+#~ msgid "brief"
+#~ msgstr "rÃ©sumÃ©e"
+
+#~ msgid "detailed"
+#~ msgstr "dÃ©taillÃ©"
+
+#~ msgid "refresh keyring"
+#~ msgstr "Recharger le trousseau de clefs"
+
+#~ msgid "Settings"
+#~ msgstr "RÃ©glages"
+
 #~ msgid "_Backup to file:"
 #~ msgstr "Sauvegarder dans le fichier:"
 

Modified: trunk/po/ja.po
===================================================================
--- trunk/po/ja.po	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/ja.po	2008-05-08 12:53:41 UTC (rev 891)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.6.1-cvs\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-03-12 12:29+0100\n"
+"POT-Creation-Date: 2008-05-08 14:51+0200\n"
 "PO-Revision-Date: 2003-11-03 17:11+0100\n"
 "Last-Translator: TAKAHASHI Tamotsu <ttakah at lapis.plala.or.jp>\n"
 "Language-Team: Japanese <gnupg-i18n at gnupg.org>\n"
@@ -15,431 +15,217 @@
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/clipboard.c:367 src/fileman.c:350
+#: src/clipboard.c:376 src/fileman.c:392
 msgid "Open File"
 msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
-#: src/clipboard.c:395 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "GPA ¥á¥Ã¥»¡¼¥¸"
 
 #. TRANSLATORS: The arguments are the filename, the integer size
 #. and the unit (such as KB or MB).
-#: src/clipboard.c:412
+#: src/clipboard.c:421
 #, fuzzy, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
 msgstr ""
 "Æ±¤¸¥Õ¥¡¥¤¥ë %s ¤¬¤¢¤ê¤Þ¤¹\n"
 "¾å½ñ¤¤·¤Þ¤¹¤«?"
 
-#: src/clipboard.c:481
+#: src/clipboard.c:542
 msgid "Save As..."
 msgstr ""
 
-#: src/clipboard.c:522 src/clipboard.c:552 src/clipboard.c:582
-#: src/clipboard.c:612 src/clipboard.c:1113 src/fileman.c:675
-#: src/keyring.c:1657
+#: src/clipboard.c:583 src/clipboard.c:613 src/clipboard.c:643
+#: src/clipboard.c:673 src/clipboard.c:1034
 #, fuzzy
 msgid "Clipboard"
 msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼ (_C)"
 
-#: src/clipboard.c:692 src/fileman.c:472 src/keyring.c:863
-msgid "/_File"
+#: src/clipboard.c:755 src/fileman.c:515 src/keyring.c:884
+#, fuzzy
+msgid "_File"
 msgstr "/¥Õ¥¡¥¤¥ë (_F)"
 
-#: src/clipboard.c:693 src/fileman.c:474
-msgid "/File/C_lear"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/¥¯¥ê¥¢ (_L)"
-
-#: src/clipboard.c:694 src/fileman.c:473
-msgid "/File/_Open"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/³«¤¯ (_O)"
-
-#: src/clipboard.c:695
+#: src/clipboard.c:756 src/fileman.c:516 src/keyring.c:885
 #, fuzzy
-msgid "/File/Save _As"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/ÊÄ¤¸¤ë (_C)"
-
-#: src/clipboard.c:697 src/fileman.c:475
-msgid "/File/sep1"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/sep1"
-
-#: src/clipboard.c:698 src/fileman.c:476
-msgid "/File/_Sign"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/½ðÌ¾¤¹¤ë (_S)"
-
-#: src/clipboard.c:699 src/fileman.c:477
-msgid "/File/_Verify"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/¸¡¾Ú (_V)"
-
-#: src/clipboard.c:700 src/fileman.c:478
-msgid "/File/_Encrypt"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/°Å¹æ²½ (_E)"
-
-#: src/clipboard.c:701 src/fileman.c:479
-msgid "/File/_Decrypt"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/Éü¹æ²½ (_D)"
-
-#: src/clipboard.c:702 src/fileman.c:480
-msgid "/File/sep2"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/sep2"
-
-#: src/clipboard.c:703 src/fileman.c:481 src/keyring.c:864
-msgid "/File/_Close"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/ÊÄ¤¸¤ë (_C)"
-
-#: src/clipboard.c:704 src/fileman.c:482 src/keyring.c:866
-msgid "/File/_Quit"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/½ªÎ» (_Q)"
-
-#: src/clipboard.c:707 src/fileman.c:485 src/keyring.c:869
-msgid "/_Edit"
+msgid "_Edit"
 msgstr "/ÊÔ½¸ (_E)"
 
-#: src/clipboard.c:710
-#, fuzzy
-msgid "/Edit/_Undo"
-msgstr "/ÊÔ½¸ (E)/¥³¥Ô¡¼ (_C)"
+#: src/clipboard.c:760
+msgid "Clear buffer"
+msgstr ""
 
-#: src/clipboard.c:711
-#, fuzzy
-msgid "/Edit/_Redo"
-msgstr "/ÊÔ½¸ (E)/¥³¥Ô¡¼ (_C)"
+#: src/clipboard.c:762 src/fileman.c:520
+msgid "Open a file"
+msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
-#: src/clipboard.c:712
+#: src/clipboard.c:764
 #, fuzzy
-msgid "/Edit/sep0"
-msgstr "/ÊÔ½¸ (E)/sep2"
+msgid "Save to a file"
+msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
 
-#: src/clipboard.c:714 src/clipboard.c:750
+#: src/clipboard.c:766
 #, fuzzy
-msgid "/Edit/Cut"
-msgstr "/ÊÔ½¸ (E)/¥³¥Ô¡¼ (C)"
+msgid "Sign buffer text"
+msgstr "¸°¤Ë½ðÌ¾"
 
-#: src/clipboard.c:715 src/keyring.c:870
-msgid "/Edit/_Copy"
-msgstr "/ÊÔ½¸ (E)/¥³¥Ô¡¼ (_C)"
-
-#: src/clipboard.c:716 src/keyring.c:872
-msgid "/Edit/_Paste"
-msgstr "/ÊÔ½¸ (E)/Å½¤êÉÕ¤± (_P)"
-
-#: src/clipboard.c:717
+#: src/clipboard.c:768
 #, fuzzy
-msgid "/Edit/_Delete"
-msgstr "/ÊÔ½¸ (E)/Å½¤êÉÕ¤± (_P)"
+msgid "Check signatures of buffer text"
+msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤Î½ðÌ¾¤ò¥Á¥§¥Ã¥¯"
 
-#: src/clipboard.c:718 src/keyring.c:874
-msgid "/Edit/sep1"
-msgstr "/ÊÔ½¸ (E)/sep1"
-
-#: src/clipboard.c:719 src/fileman.c:486 src/keyring.c:875
-msgid "/Edit/Select _All"
-msgstr "/ÊÔ½¸ (E)/¤¹¤Ù¤ÆÁªÂò (_A)"
-
-#: src/clipboard.c:721 src/fileman.c:487 src/keyring.c:876
-msgid "/Edit/sep2"
-msgstr "/ÊÔ½¸ (E)/sep2"
-
-#: src/clipboard.c:722 src/fileman.c:488 src/keyring.c:877
-msgid "/Edit/Pr_eferences..."
-msgstr "/ÊÔ½¸ (E)/ÀßÄê (_E)"
-
-#: src/clipboard.c:724 src/fileman.c:490 src/keyring.c:879
+#: src/clipboard.c:770
 #, fuzzy
-msgid "/Edit/_Backend Preferences..."
-msgstr "/ÊÔ½¸ (E)/ÀßÄê (_E)"
+msgid "Encrypt the buffer text"
+msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤ò°Å¹æ²½¤¹¤ë"
 
-#: src/clipboard.c:728 src/fileman.c:494 src/keyring.c:906
-msgid "/_Windows"
-msgstr "/¥¦¥£¥ó¥É¥¦ (_W)"
-
-#: src/clipboard.c:729 src/fileman.c:495 src/keyring.c:907
-msgid "/Windows/_Keyring Editor"
-msgstr "/¥¦¥£¥ó¥É¥¦ (W)/¸°Â«¥¨¥Ç¥£¥¿ (_K)"
-
-#: src/clipboard.c:730 src/fileman.c:496
-msgid "/Windows/_Filemanager"
-msgstr "/¥¦¥£¥ó¥É¥¦ (W)/¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã (_F)"
-
-#: src/clipboard.c:731 src/fileman.c:497 src/keyring.c:909
+#: src/clipboard.c:772
 #, fuzzy
-msgid "/Windows/_Clipboard"
-msgstr "/¥¦¥£¥ó¥É¥¦ (W)/¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã (_F)"
+msgid "Decrypt the buffer text"
+msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤òÉü¹æ²½¤¹¤ë"
 
-#: src/clipboard.c:758 src/keyring.c:948
-msgid "/Edit/Copy"
-msgstr "/ÊÔ½¸ (E)/¥³¥Ô¡¼ (C)"
-
-#: src/clipboard.c:766
-#, fuzzy
-msgid "/Edit/Delete"
-msgstr "/ÊÔ½¸ (E)/¤¹¤Ù¤ÆÁªÂò (_A)"
-
 #: src/clipboard.c:774
-#, fuzzy
-msgid "/Edit/Paste"
-msgstr "/ÊÔ½¸ (E)/Å½¤êÉÕ¤± (_P)"
-
-#: src/clipboard.c:879
-msgid "Clear buffer"
+msgid "Close the buffer"
 msgstr ""
 
-#: src/clipboard.c:879
-msgid "clear buffer"
+#: src/clipboard.c:776 src/fileman.c:534 src/keyring.c:893
+msgid "Quit the program"
 msgstr ""
 
-#: src/clipboard.c:887 src/fileman.c:602
-msgid "Open a file"
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
-
-#: src/clipboard.c:887 src/fileman.c:602
-msgid "open file"
-msgstr "¥Õ¥¡¥¤¥ë³«¤¯"
-
-#: src/clipboard.c:892
+#: src/clipboard.c:782
 #, fuzzy
-msgid "Save to a file"
-msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤¯"
+msgid "Undo the last action"
+msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤ò°Å¹æ²½¤¹¤ë"
 
-#: src/clipboard.c:892
-#, fuzzy
-msgid "save file as"
-msgstr "Ì¾Á°¤òÉÕ¤±¤ÆÊÝÂ¸ (_A): "
+#: src/clipboard.c:784
+msgid "Redo the last undone action"
+msgstr ""
 
-#: src/clipboard.c:900
+#: src/clipboard.c:787
 #, fuzzy
 msgid "Cut the selection"
 msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤ò°Å¹æ²½¤¹¤ë"
 
-#: src/clipboard.c:901
+#: src/clipboard.c:789 src/keyring.c:897
 #, fuzzy
-msgid "cut the selection"
-msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤ò°Å¹æ²½¤¹¤ë"
-
-#: src/clipboard.c:907
-#, fuzzy
 msgid "Copy the selection"
 msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤ò°Å¹æ²½¤¹¤ë"
 
-#: src/clipboard.c:908
+#: src/clipboard.c:791 src/keyring.c:899
 #, fuzzy
-msgid "copy the selection"
-msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤ò°Å¹æ²½¤¹¤ë"
-
-#: src/clipboard.c:914
-#, fuzzy
 msgid "Paste the clipboard"
 msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼ (_C)"
 
-#: src/clipboard.c:915
+#: src/clipboard.c:793
 #, fuzzy
-msgid "paste the clipboard"
-msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼ (_C)"
-
-#: src/clipboard.c:925 src/fileman.c:612 src/keyring.c:1570
-msgid "Sign"
-msgstr "½ðÌ¾¤¹¤ë"
-
-#: src/clipboard.c:926
-#, fuzzy
-msgid "Sign the selected text"
-msgstr "ÁªÂò¤µ¤ì¤¿¸°¤Ë½ðÌ¾¤¹¤ë"
-
-#: src/clipboard.c:927
-#, fuzzy
-msgid "sign text"
-msgstr "¸°¤Ë½ðÌ¾"
-
-#: src/clipboard.c:935 src/fileman.c:623
-msgid "Verify"
-msgstr "¸¡¾Ú"
-
-#: src/clipboard.c:936
-#, fuzzy
-msgid "Check signatures of selected text"
-msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤Î½ðÌ¾¤ò¥Á¥§¥Ã¥¯"
-
-#: src/clipboard.c:937
-#, fuzzy
-msgid "verify text"
-msgstr "¥Õ¥¡¥¤¥ë¸¡¾Ú"
-
-#: src/clipboard.c:945 src/fileman.c:634
-msgid "Encrypt"
-msgstr "°Å¹æ²½"
-
-#: src/clipboard.c:946
-#, fuzzy
-msgid "Encrypt the selected text"
-msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤ò°Å¹æ²½¤¹¤ë"
-
-#: src/clipboard.c:947
-#, fuzzy
-msgid "encrypt text"
-msgstr "¥Õ¥¡¥¤¥ë°Å¹æ²½"
-
-#: src/clipboard.c:955 src/fileman.c:645
-msgid "Decrypt"
-msgstr "Éü¹æ²½"
-
-#: src/clipboard.c:956
-#, fuzzy
-msgid "Decrypt the selected text"
+msgid "Delete the selected text"
 msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤òÉü¹æ²½¤¹¤ë"
 
-#: src/clipboard.c:957
-#, fuzzy
-msgid "decrypt text"
-msgstr "¥Õ¥¡¥¤¥ëÉü¹æ²½"
+#: src/clipboard.c:795
+msgid "Select the entire document"
+msgstr ""
 
-#: src/clipboard.c:967 src/fileman.c:658 src/keyring.c:1631
+#: src/clipboard.c:902 src/fileman.c:625
 #, fuzzy
-msgid "Open the preferences dialog"
-msgstr "ÀßÄê¥À¥¤¥¢¥í¥°¤ò³«¤¯"
-
-#: src/clipboard.c:968 src/fileman.c:659 src/keyring.c:1632
-msgid "preferences"
-msgstr "ÀßÄê"
-
-#: src/clipboard.c:975 src/fileman.c:666
-#, fuzzy
 msgid "Keyring"
 msgstr "¸°Â«¥¨¥Ç¥£¥¿"
 
-#: src/clipboard.c:976 src/fileman.c:667
-#, fuzzy
-msgid "Open the keyring editor"
-msgstr "¸°Â«¥¨¥Ç¥£¥¿¤ò³«¤¯ (¥Ç¥Õ¥©¥ë¥È)"
-
-#: src/clipboard.c:977 src/fileman.c:668
-#, fuzzy
-msgid "keyring editor"
-msgstr "¸°Â«¥¨¥Ç¥£¥¿"
-
-#: src/clipboard.c:983 src/keyring.c:1648
+#: src/clipboard.c:904 src/keyring.c:1073
 msgid "Files"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: src/clipboard.c:984 src/keyring.c:1649
+#: src/clipboard.c:1004
 #, fuzzy
-msgid "Open the file manager"
-msgstr "¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤ò³«¤¯"
-
-#: src/clipboard.c:985 src/keyring.c:1650
-msgid "file manager"
-msgstr "¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã"
-
-#: src/clipboard.c:992 src/fileman.c:684 src/keyring.c:1665
-msgid "Help"
-msgstr "¥Ø¥ë¥×"
-
-#: src/clipboard.c:993 src/fileman.c:685 src/keyring.c:1666
-msgid "Understanding the GNU Privacy Assistant"
-msgstr "GNU Privacy Assistant ¤Ë¤Ä¤¤¤ÆÍý²ò¤¹¤ë"
-
-#: src/clipboard.c:994 src/fileman.c:686 src/keyring.c:1667
-msgid "help"
-msgstr "¥Ø¥ë¥×"
-
-#: src/clipboard.c:1084
-#, fuzzy
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Privacy Assistant - ¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã"
 
-#: src/confdialog.c:993
+#: src/confdialog.c:994
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 #, fuzzy
 msgid "Use default values"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¸°¤òÀßÄê"
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 #, fuzzy
 msgid "Use default value"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¸°¤òÀßÄê"
 
-#: src/confdialog.c:1146
+#: src/confdialog.c:1147
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1155
+#: src/confdialog.c:1156
 #, fuzzy
 msgid "Use default argument"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î°¸Àè¤ÎÀßÄê"
 
-#: src/confdialog.c:1280
+#: src/confdialog.c:1281
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1325
+#: src/confdialog.c:1326
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1334
+#: src/confdialog.c:1332
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1346
+#: src/confdialog.c:1351
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1350
+#: src/confdialog.c:1355
 #, fuzzy
 msgid "Level:"
 msgstr "¥ì¥Ù¥ë"
 
-#: src/confdialog.c:1359
+#: src/confdialog.c:1364
 #, fuzzy
 msgid "Basic"
 msgstr "/¥Ð¥Ã¥¯¥¢¥Ã¥×... (_B)"
 
-#: src/confdialog.c:1360
+#: src/confdialog.c:1365
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1361
+#: src/confdialog.c:1366
 #, fuzzy
 msgid "Expert"
 msgstr "¥¨¥¯¥¹¥Ý¡¼¥È"
 
-#: src/encryptdlg.c:142 src/expirydlg.c:116 src/filesigndlg.c:133
-#: src/gpabackupop.c:292 src/gpaprogressdlg.c:146 src/gparecvkeydlg.c:96
-#: src/gpawizard.c:289 src/gpgmetools.c:696 src/keygendlg.c:149
-#: src/ownertrustdlg.c:111 src/passwddlg.c:100
-msgid "_Cancel"
-msgstr "¥¥ã¥ó¥»¥ë (_C)"
-
-#: src/encryptdlg.c:143
+#: src/encryptdlg.c:139
 #, fuzzy
 msgid "Encrypt documents"
 msgstr "¥Õ¥¡¥¤¥ë°Å¹æ²½"
 
-#: src/encryptdlg.c:174
+#: src/encryptdlg.c:156
 msgid "_Public Keys"
 msgstr "¸ø³«¸° (_P)"
 
-#: src/encryptdlg.c:177
+#: src/encryptdlg.c:179 src/icons.c:198
 msgid "_Sign"
 msgstr "½ðÌ¾¤¹¤ë (_S)"
 
-#: src/encryptdlg.c:201 src/filesigndlg.c:185
+#: src/encryptdlg.c:185
 msgid "Sign _as "
 msgstr "½ðÌ¾ÁªÂò (_A)"
 
-#: src/encryptdlg.c:215 src/filesigndlg.c:187
+#: src/encryptdlg.c:215 src/filesigndlg.c:227
 msgid "A_rmor"
 msgstr "¥¢¡¼¥Þ¤Î·ÁÀ® (_R)"
 
@@ -447,148 +233,100 @@
 msgid "Please provide a correct date."
 msgstr "Àµ¤·¤¤ÆüÉÕ¤òÆþÎÏ¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: src/expirydlg.c:111
+#: src/expirydlg.c:108
 msgid "Change expiry date"
 msgstr "Í¸ú´ü¸Â¤òÊÑ¹¹"
 
-#: src/expirydlg.c:129
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+msgid "_Cancel"
+msgstr "¥¥ã¥ó¥»¥ë (_C)"
+
+#: src/expirydlg.c:124
 msgid "_never expire"
 msgstr "Ìµ´ü¸ÂÍ¸ú (_N)"
 
-#: src/expirydlg.c:134
+#: src/expirydlg.c:129
 msgid "_expire on:"
 msgstr "Í¸ú´ü¸Â¤Î»ØÄê (_E):"
 
-#: src/fileman.c:355 src/fileman.c:953
-msgid "The file is already open."
-msgstr "¥Õ¥¡¥¤¥ë¤Ï³«¤«¤ì¤Æ¤¤¤Þ¤¹"
-
-#: src/fileman.c:516
-msgid "/File/Sign"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/½ðÌ¾¤¹¤ë (S)"
-
-#: src/fileman.c:521
-msgid "/File/Verify"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/¸¡¾Ú (V)"
-
-#: src/fileman.c:526
-msgid "/File/Encrypt"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/°Å¹æ²½ (E)"
-
-#: src/fileman.c:531
-msgid "/File/Decrypt"
-msgstr "/¥Õ¥¡¥¤¥ë (F)/Éü¹æ²½ (D)"
-
-#: src/fileman.c:606
+#: src/fileman.c:522
 msgid "Close all files"
 msgstr "¥Õ¥¡¥¤¥ë¤ò¤¹¤Ù¤ÆÊÄ¤¸¤ë"
 
-#: src/fileman.c:606
-msgid "close files"
-msgstr "¥Õ¥¡¥¤¥ëÊÄ¤¸¤ë"
-
-#: src/fileman.c:613
+#: src/fileman.c:524
 msgid "Sign the selected file"
 msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤Ë½ðÌ¾¤¹¤ë"
 
-#: src/fileman.c:614
-msgid "sign file"
-msgstr "¥Õ¥¡¥¤¥ë¤Ë½ðÌ¾"
-
-#: src/fileman.c:624
+#: src/fileman.c:526
 msgid "Check signatures of selected file"
 msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤Î½ðÌ¾¤ò¥Á¥§¥Ã¥¯"
 
-#: src/fileman.c:625
-msgid "verify file"
-msgstr "¥Õ¥¡¥¤¥ë¸¡¾Ú"
-
-#: src/fileman.c:635
+#: src/fileman.c:528
 msgid "Encrypt the selected file"
 msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤ò°Å¹æ²½¤¹¤ë"
 
-#: src/fileman.c:636
-msgid "encrypt file"
-msgstr "¥Õ¥¡¥¤¥ë°Å¹æ²½"
-
-#: src/fileman.c:646
+#: src/fileman.c:530
 msgid "Decrypt the selected file"
 msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤òÉü¹æ²½¤¹¤ë"
 
-#: src/fileman.c:647
-msgid "decrypt file"
-msgstr "¥Õ¥¡¥¤¥ëÉü¹æ²½"
+#: src/fileman.c:532
+msgid "Close the window"
+msgstr ""
 
-#: src/fileman.c:676 src/keyring.c:1658
+#: src/fileman.c:538
 #, fuzzy
-msgid "Open the clipboard"
-msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼ (_C)"
+msgid "Select all files"
+msgstr "¥Õ¥¡¥¤¥ë¤ò¤¹¤Ù¤ÆÊÄ¤¸¤ë"
 
-#: src/fileman.c:677 src/keyring.c:1659
-#, fuzzy
-msgid "clipboard"
-msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼ (_C)"
-
-#: src/fileman.c:785
+#: src/fileman.c:731
 msgid "File"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: src/fileman.c:850
+#: src/fileman.c:796
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - ¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã"
 
-#: src/fileman.c:876
+#: src/fileman.c:819
 #, fuzzy
 msgid "File Manager"
 msgstr "¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã"
 
-#: src/filesigndlg.c:134
+#: src/fileman.c:895
+msgid "The file is already open."
+msgstr "¥Õ¥¡¥¤¥ë¤Ï³«¤«¤ì¤Æ¤¤¤Þ¤¹"
+
+#: src/filesigndlg.c:171
 msgid "Sign documents"
 msgstr ""
 
-#: src/filesigndlg.c:144
-msgid "Signing Mode"
+#: src/filesigndlg.c:180
+#, fuzzy
+msgid "<b>Sign _as</b>"
+msgstr "½ðÌ¾ÁªÂò (_A)"
+
+#: src/filesigndlg.c:201
+#, fuzzy
+msgid "<b>Signing Mode</b>"
 msgstr "½ðÌ¾Êý¼°"
 
-#: src/filesigndlg.c:152
-msgid "si_gn and compress"
+#: src/filesigndlg.c:211
+#, fuzzy
+msgid "Si_gn and compress"
 msgstr "°µ½Ì¤¢¤ê¤Ç½ðÌ¾¤¹¤ë (_G)"
 
-#: src/filesigndlg.c:158
-msgid "_cleartext signature"
+#: src/filesigndlg.c:217
+#, fuzzy
+msgid "Clear_text signature"
 msgstr "Ê¿Ê¸½ðÌ¾ (_C)"
 
-#: src/filesigndlg.c:165
+#: src/filesigndlg.c:223
 #, fuzzy
-msgid "_detached signature"
+msgid "_Detached signature"
 msgstr "Ê¿Ê¸½ðÌ¾ (_C)"
 
-#: src/gpabackupop.c:213 src/gpgmetools.c:138
+#: src/gpabackupop.c:208
 #, c-format
 msgid ""
-"The file %s already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Æ±¤¸¥Õ¥¡¥¤¥ë %s ¤¬¤¢¤ê¤Þ¤¹\n"
-"¾å½ñ¤¤·¤Þ¤¹¤«?"
-
-#: src/gpabackupop.c:216 src/gpaexportserverop.c:134
-#: src/gpafileencryptop.c:455 src/gpafileverifyop.c:178 src/gpgmetools.c:141
-#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:62
-#: src/settingsdlg.c:165
-msgid "_Yes"
-msgstr "¤Ï¤¤ (_Y)"
-
-#: src/gpabackupop.c:217 src/gpaexportserverop.c:135
-#: src/gpafileencryptop.c:456 src/gpafileverifyop.c:179 src/gpgmetools.c:142
-#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:64
-#: src/settingsdlg.c:168
-msgid "_No"
-msgstr "¤¤¤¤¤¨ (_N)"
-
-#: src/gpabackupop.c:229
-#, c-format
-msgid ""
 "A copy of your secret key has been made to the file:\n"
 "\n"
 "\t\"%s\"\n"
@@ -603,31 +341,19 @@
 "¤ËºîÀ®¤µ¤ì¤Þ¤·¤¿¡£¤³¤ì¤Ï½ÅÍ×¤Ê¾ðÊó¤Ç¤¹¤«¤é¡¢¿µ½Å¤ËÊÝ´É¤·¤Æ\n"
 "¤¯¤À¤µ¤¤ (Îã¤¨¤Ð¥Õ¥í¥Ã¥Ô¡¼¤ËÆþ¤ì¤Æ°ÂÁ´¤Ê¾ì½ê¤Ë±£¤·¤Æ¤ª¤¯)¡£"
 
-#: src/gpabackupop.c:244
+#: src/gpabackupop.c:223
 msgid "An error ocurred during the backup operation."
 msgstr ""
 
-#: src/gpabackupop.c:260
+#: src/gpabackupop.c:245
 msgid "Backup key to file"
 msgstr "¸°¤ò¥Õ¥¡¥¤¥ë¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë"
 
-#: src/gpabackupop.c:287
-msgid "Backup Keys"
-msgstr "¸°¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×"
-
-#: src/gpabackupop.c:311
+#: src/gpabackupop.c:255
 #, c-format
 msgid "Generating backup of key: %s"
 msgstr "¸°¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤òºîÀ®¤¹¤ë: %s"
 
-#: src/gpabackupop.c:317
-msgid "_Backup to file:"
-msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×Àè¥Õ¥¡¥¤¥ë (_B):"
-
-#: src/gpabackupop.c:329
-msgid "B_rowse..."
-msgstr "¥Ö¥é¥¦¥º... (_R)"
-
 #: src/gpa.c:92
 #, fuzzy
 msgid "Output version information and exit"
@@ -649,26 +375,31 @@
 msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼ (_C)"
 
 #: src/gpa.c:100
-msgid "Start only the UI server (implies --cms)"
+#, fuzzy
+msgid "Open the settings dialog"
+msgstr "ÀßÄê¥À¥¤¥¢¥í¥°¤ò³«¤¯"
+
+#: src/gpa.c:102
+msgid "Enable the UI server (implies --cms)"
 msgstr ""
 
-#: src/gpa.c:102
+#: src/gpa.c:104
 #, fuzzy
 msgid "Read options from file"
 msgstr "¥Õ¥¡¥¤¥ë¤«¤é¥ª¥×¥·¥ç¥óÆÉ¹þ"
 
-#: src/gpa.c:293
+#: src/gpa.c:286
 msgid "[FILE...]"
 msgstr ""
 
-#: src/gpa.c:295
+#: src/gpa.c:288
 #, fuzzy
 msgid "Graphical frontend to GnuPG"
 msgstr ""
 "¹½Ê¸: gpa [¥ª¥×¥·¥ç¥ó]\n"
 "GnuPG ¤Î¥°¥é¥Õ¥£¥«¥ë¤Ê¥Õ¥í¥ó¥È¥¨¥ó¥É\n"
 
-#: src/gpa.c:296
+#: src/gpa.c:289
 msgid "Please report bugs to <"
 msgstr "¥Ð¥°¤Ï <"
 
@@ -676,15 +407,15 @@
 msgid "The keys have been copied to the clipboard."
 msgstr "¸°¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼¤·¤Þ¤·¤¿¡£"
 
-#: src/gpaexportfileop.c:133
+#: src/gpaexportfileop.c:139
 msgid "Export public keys to file"
 msgstr "¸ø³«¸°¤ò¥Õ¥¡¥¤¥ë¤Ø¥¨¥¯¥¹¥Ý¡¼¥È"
 
-#: src/gpaexportfileop.c:137
+#: src/gpaexportfileop.c:150
 msgid "_armor"
 msgstr "¥¢¡¼¥Þ (_A)"
 
-#: src/gpaexportfileop.c:171
+#: src/gpaexportfileop.c:182
 #, c-format
 msgid "The keys have been exported to %s."
 msgstr "¸°¤¬ %s ¤Ë¥¨¥¯¥¹¥Ý¡¼¥È¤µ¤ì¤Þ¤·¤¿¡£"
@@ -700,6 +431,18 @@
 "(¥µ¡¼¥Ð: \"%s\")\n"
 "ËÜÅö¤Ë¤³¤Î¸°¤ò¹¤¯ÇÛÉÛ¤·¤Æ¤è¤í¤·¤¤¤Ç¤¹¤«?"
 
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:459
+#: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
+#: src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "¤Ï¤¤ (_Y)"
+
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:460
+#: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
+#: src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "¤¤¤¤¤¨ (_N)"
+
 #: src/gpaexportserverop.c:187
 msgid "The keys have been sent to the server."
 msgstr "¸°¤ò¥µ¡¼¥Ð¤ØÁ÷¿®¤·¤Þ¤·¤¿¡£"
@@ -708,29 +451,29 @@
 msgid "Decrypting..."
 msgstr "Éü¹æ²½Ãæ..."
 
-#: src/gpafiledecryptop.c:358 src/gpafileverifyop.c:449
+#: src/gpafiledecryptop.c:367 src/gpafileverifyop.c:464
 #, fuzzy, c-format
 msgid "\"%s\" contained no OpenPGP data."
 msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Ë¤Ï OpenPGP ¥Ç¡¼¥¿¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: src/gpafiledecryptop.c:359 src/gpafileverifyop.c:450
+#: src/gpafiledecryptop.c:368 src/gpafileverifyop.c:465
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no OpenPGPdata."
 msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Ë¤Ï OpenPGP ¥Ç¡¼¥¿¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: src/gpafiledecryptop.c:369
+#: src/gpafiledecryptop.c:378
 #, fuzzy, c-format
 msgid "\"%s\" contained no valid encrypted data."
 msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Ë¤ÏÍ¸ú¤Ê°Å¹æ²½¥Ç¡¼¥¿¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: src/gpafiledecryptop.c:371
+#: src/gpafiledecryptop.c:380
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no validencrypted data."
 msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤Ë¤ÏÍ¸ú¤Ê°Å¹æ²½¥Ç¡¼¥¿¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
 
-#: src/gpafiledecryptop.c:380 src/gpafileencryptop.c:727
-#: src/gpafilesignop.c:510 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
-#: src/gpakeypasswdop.c:197 src/gpakeysignop.c:229
+#: src/gpafiledecryptop.c:389 src/gpafileencryptop.c:751
+#: src/gpafilesignop.c:525 src/gpafileverifyop.c:475 src/gpakeyexpireop.c:240
+#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:237
 msgid "Wrong passphrase!"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬°ã¤¤¤Þ¤¹¡ª"
 
@@ -738,61 +481,60 @@
 msgid "Encrypting..."
 msgstr "°Å¹æ²½Ãæ..."
 
-#: src/gpafileencryptop.c:453 src/verifydlg.c:222
+#: src/gpafileencryptop.c:457 src/verifydlg.c:222
 msgid "Unknown Key"
 msgstr "Ì¤³ÎÇ§¤Î¸°"
 
-#: src/gpafileencryptop.c:469
+#: src/gpafileencryptop.c:473
 #, fuzzy
 msgid "You are going to encrypt a document using the following key:"
 msgstr "¼¡¤Î¸°¤ò»È¤Ã¤Æ¥Õ¥¡¥¤¥ë¤ò°Å¹æ²½¤·¤è¤¦¤È¤·¤Æ¤¤¤Þ¤¹:"
 
-#: src/gpafileencryptop.c:475
+#: src/gpafileencryptop.c:479
 msgid "However, it is not certain that the key belongs to that person."
 msgstr "¤È¤Ï¤¤¤¨¡¢¤½¤Î¸°¤¬¤½¤Î¿Í¤ËÂ°¤·¤Æ¤¤¤ë¤«¤É¤¦¤«¤Ï³Î¼Â¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: src/gpafileencryptop.c:481
+#: src/gpafileencryptop.c:485
 msgid "Do you <b>really</b> want to use this key?"
 msgstr "<b>ËÜÅö¤Ë</b>¤³¤Î¸°¤ò»È¤¤¤¿¤¤¤Î¤Ç¤¹¤«?"
 
-#: src/gpafileencryptop.c:502 src/gpafileencryptop.c:542 src/verifydlg.c:227
+#: src/gpafileencryptop.c:506 src/gpafileencryptop.c:546 src/verifydlg.c:227
 msgid "Revoked Key"
 msgstr "ÇË´þºÑ¤ß¤Î¸°"
 
-#: src/gpafileencryptop.c:504 src/gpafileencryptop.c:544 src/gpawizard.c:281
-#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:422
-#: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
+#: src/gpafileencryptop.c:508 src/gpafileencryptop.c:548 src/gtktools.c:52
+#: src/gtktools.c:86 src/keyeditdlg.c:149 src/verifydlg.c:115
 msgid "_Close"
 msgstr "ÊÄ¤¸¤ë (_C)"
 
-#: src/gpafileencryptop.c:517
+#: src/gpafileencryptop.c:521
 msgid "The following key has been revoked by it's owner:"
 msgstr "°Ê²¼¤Î¸°¤Ï½êÍ¼Ô¤Ë¤è¤Ã¤ÆÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹:"
 
-#: src/gpafileencryptop.c:522 src/gpafileencryptop.c:565
+#: src/gpafileencryptop.c:526 src/gpafileencryptop.c:569
 msgid "And can not be used for encryption."
 msgstr "¤è¤Ã¤Æ¡¢°Å¹æ²½¤Ë»È¤¦¤³¤È¤Ï¤Ç¤¤Þ¤»¤ó¡£"
 
-#: src/gpafileencryptop.c:557
+#: src/gpafileencryptop.c:561
 #, c-format
 msgid "The following key expired on %s:"
 msgstr "¼¡¤Î¸°¤ÎÍ¸ú´ü¸Â¤Ï %s ¤Ç¤¹:"
 
-#: src/gpafileencryptop.c:641 src/gpafilesignop.c:414
+#: src/gpafileencryptop.c:600 src/gpafilesignop.c:448
+msgid ""
+"The selected certificates are not all of the same type. That is, you mixed "
+"OpenPGP and X.509 certificates. Please make sure to select only certificates "
+"of the same type."
+msgstr ""
+
+#: src/gpafileencryptop.c:675 src/gpafilesignop.c:434
 msgid "You didn't select any key for signing"
 msgstr "½ðÌ¾¤¹¤ë¸°¤òÁªÂò¤·¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/gpafilesignop.c:148
+#: src/gpafilesignop.c:157
 msgid "Signing..."
 msgstr "½ðÌ¾Ãæ..."
 
-#: src/gpafilesignop.c:428
-msgid ""
-"The selected certificates are not all of the same type. That is, you mixed "
-"OpenPGP and X.509 certificates. Please make sure to select only certificates "
-"of the same type."
-msgstr ""
-
 #: src/gpafileverifyop.c:101
 msgid "Verifying..."
 msgstr "¸¡¾ÚÃæ..."
@@ -810,15 +552,15 @@
 msgid "Generating Key..."
 msgstr "¸°¤òÀ¸À®Ãæ..."
 
-#: src/gpaimportfileop.c:131
+#: src/gpaimportfileop.c:132
 msgid "Import public keys from file"
 msgstr "¥Õ¥¡¥¤¥ë¤«¤é¸ø³«¸°¤ò¥¤¥ó¥Ý¡¼¥È¤¹¤ë"
 
-#: src/gpaimportop.c:197
+#: src/gpaimportop.c:196
 msgid "No keys were found."
 msgstr "¸°¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£"
 
-#: src/gpaimportop.c:205
+#: src/gpaimportop.c:204
 #, c-format
 msgid ""
 "%i public keys read\n"
@@ -835,35 +577,35 @@
 "%i ¸Ä¤ÎÈëÌ©¸°¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤·¤¿\n"
 "%i ¸Ä¤ÎÈëÌ©¸°¤ÏÌµÊÑ¹¹¤Ç¤¹"
 
-#: src/gpakeyexpireop.c:239
+#: src/gpakeyexpireop.c:244
 msgid ""
 "Invalid time given.\n"
 "(you may not set the expiration time to the past.)"
 msgstr ""
 
-#: src/gpakeyselector.c:86 src/keylist.c:567 src/siglist.c:94
+#: src/gpakeyselector.c:86 src/keylist.c:555 src/siglist.c:94
 #: src/siglist.c:114 src/verifydlg.c:324
 msgid "Key ID"
 msgstr "¸° ID"
 
-#: src/gpakeyselector.c:95 src/keylist.c:618 src/siglist.c:100
+#: src/gpakeyselector.c:95 src/keylist.c:606 src/siglist.c:100
 #: src/siglist.c:143 src/verifydlg.c:336
 msgid "User Name"
 msgstr "¥æ¡¼¥¶Ì¾"
 
-#: src/gpakeysignop.c:188
+#: src/gpakeysignop.c:191
 msgid "No private key for signing."
 msgstr "½ðÌ¾¤Ë»È¤¦¸ø³«¸°¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: src/gpakeysignop.c:233
+#: src/gpakeysignop.c:241
 msgid "This key has expired! Unable to sign."
 msgstr "¤³¤Î¸°¤Ï´ü¸Â¤¬ÀÚ¤ì¤Æ¤¤¤Þ¤¹¡ª ½ðÌ¾¤Ç¤¤Þ¤»¤ó¡£"
 
-#: src/gpakeysignop.c:237
+#: src/gpakeysignop.c:245
 msgid "This key has already been signed with your own!"
 msgstr "¤³¤Î¸°¤Ï´û¤Ë¼«Ê¬¼«¿È¤Î¸°¤Ç½ðÌ¾¤·¤Æ¤¢¤ê¤Þ¤¹¡ª"
 
-#: src/gpakeysignop.c:242
+#: src/gpakeysignop.c:250
 msgid "You haven't selected a default key to sign with!"
 msgstr "½ðÌ¾¤¹¤ë¥Ç¥Õ¥©¥ë¥È¤Î¸°¤òÁªÂò¤·¤Æ¤¤¤Þ¤»¤ó¡ª"
 
@@ -891,7 +633,7 @@
 msgid "unknown"
 msgstr "Ì¤³ÎÇ§"
 
-#: src/gparecvkeydlg.c:101
+#: src/gparecvkeydlg.c:106
 msgid "Which key do you want to import? (The key must be specified by key ID)."
 msgstr "¤É¤Î¸°¤ò¥¤¥ó¥Ý¡¼¥È¤·¤Þ¤¹¤«? (¸°¤Ï ID ¤Ç»ØÄê¤¹¤ëÉ¬Í×¤¬¤¢¤ê¤Þ¤¹)"
 
@@ -915,7 +657,7 @@
 msgid "Size"
 msgstr "¥µ¥¤¥º"
 
-#: src/gpasubkeylist.c:97 src/keyeditdlg.c:171 src/keylist.c:580
+#: src/gpasubkeylist.c:97 src/keyeditdlg.c:168 src/keylist.c:568
 msgid "Expiry Date"
 msgstr "Í¸ú´ü¸Â"
 
@@ -935,16 +677,16 @@
 msgid "Can authenticate"
 msgstr "Ç§¾Ú²ÄÇ½"
 
-#: src/gpasubkeylist.c:137 src/gpgmetools.c:613 src/gpgmetools.c:821
-#: src/gpgmetools.c:940
+#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:833
+#: src/gpgmetools.c:952
 msgid "Revoked"
 msgstr "ÇË´þºÑ¤ß"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:615 src/gpgmetools.c:936
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:948
 msgid "Expired"
 msgstr "´ü¸ÂÀÚ¤ì"
 
-#: src/gpasubkeylist.c:145 src/gpgmetools.c:617
+#: src/gpasubkeylist.c:145 src/gpgmetools.c:626
 msgid "Disabled"
 msgstr "Ìµ¸ú"
 
@@ -952,41 +694,41 @@
 msgid "Unsigned"
 msgstr "½ðÌ¾¤Ê¤·"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:927 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:939 src/verifydlg.c:212
 msgid "Valid"
 msgstr "Í¸ú"
 
-#: src/gpawidgets.c:72 src/gpgmetools.c:661 src/gpgmetools.c:668
-#: src/keyring.c:1176 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
+#: src/keyring.c:1248 src/keysigndlg.c:100
 msgid "User Name:"
 msgstr "¥æ¡¼¥¶Ì¾:"
 
-#: src/gpawidgets.c:72 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/keysigndlg.c:100
 msgid "User Names:"
 msgstr "¥æ¡¼¥¶Ì¾:"
 
-#: src/gpawidgets.c:78 src/gpgmetools.c:662 src/gpgmetools.c:669
-#: src/keyring.c:1178
+#: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
+#: src/keyring.c:1250
 msgid "Key ID:"
 msgstr "¸° ID:"
 
-#: src/gpawidgets.c:194
+#: src/gpawidgets.c:180
 msgid "Expiration"
 msgstr "´ü¸Â"
 
-#: src/gpawidgets.c:201
+#: src/gpawidgets.c:187
 msgid "_indefinitely valid"
 msgstr "Ìµ´ü¸ÂÍ¸ú (_I)"
 
-#: src/gpawidgets.c:210
+#: src/gpawidgets.c:195
 msgid "expire _after"
 msgstr "Í¸ú¤Ê´ü´Ö (_A):"
 
-#: src/gpawidgets.c:229
+#: src/gpawidgets.c:215
 msgid "expire o_n:"
 msgstr "Í¸ú´ü¸Â¤Î»ØÄê (_N):"
 
-#: src/gpawidgets.c:302 src/keygendlg.c:295
+#: src/gpawidgets.c:289 src/keygendlg.c:291
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -994,20 +736,7 @@
 "¡ªÃ×Ì¿Åª¥¨¥é¡¼¡ª\n"
 "Í¸ú´ü¸Â¤ÎÆþÎÏÊý¼°¤¬ÉÔÀµ¤Ç¤¹"
 
-#: src/gpawizard.c:260
-#, fuzzy
-msgid "_Back"
-msgstr "/¥Ð¥Ã¥¯¥¢¥Ã¥×... (_B)"
-
-#: src/gpawizard.c:267
-msgid "_Forward"
-msgstr ""
-
-#: src/gpawizard.c:274
-msgid "_Apply"
-msgstr ""
-
-#: src/gpgmetools.c:58
+#: src/gpgmetools.c:59
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -1024,7 +753,7 @@
 "\n"
 "¤³¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ï½ªÎ»¤·¤Þ¤¹"
 
-#: src/gpgmetools.c:72
+#: src/gpgmetools.c:73
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -1043,8 +772,17 @@
 "¤³¤ì¤Ï¤ª¤½¤é¤¯ GPA ¤Î¥Ð¥°¤Ç¤¹¡£\n"
 "¤¿¤À¤¤¤Þ¥¨¥é¡¼¤«¤é¤ÎÉüµì¤ò»î¤ß¤Þ¤¹¡£"
 
-#: src/gpgmetools.c:477
+#: src/gpgmetools.c:139
+#, c-format
 msgid ""
+"The file %s already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Æ±¤¸¥Õ¥¡¥¤¥ë %s ¤¬¤¢¤ê¤Þ¤¹\n"
+"¾å½ñ¤¤·¤Þ¤¹¤«?"
+
+#: src/gpgmetools.c:486
+msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
 "* a safe place.                                                        *\n"
@@ -1057,7 +795,7 @@
 "**********************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:482
+#: src/gpgmetools.c:491
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -1065,186 +803,174 @@
 "¤³¤Î¥Õ¥¡¥¤¥ë¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤µ¤ì¤Æ¤¤¤ë¸°¤Ï:\n"
 "\n"
 
-#: src/gpgmetools.c:543
+#: src/gpgmetools.c:552
 msgid "DSA and ElGamal (default)"
 msgstr "DSA ¤È ElGamel (¥Ç¥Õ¥©¥ë¥È)"
 
-#: src/gpgmetools.c:544
+#: src/gpgmetools.c:553
 msgid "DSA (sign only)"
 msgstr "DSA (½ðÌ¾¤Î¤ß)"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:554
 msgid "RSA (sign only)"
 msgstr "RSA (½ðÌ¾¤Î¤ß)"
 
-#: src/gpgmetools.c:581 src/gpgmetools.c:604 src/gpgmetools.c:621
-#: src/gpgmetools.c:932 src/gpgmetools.c:965
+#: src/gpgmetools.c:590 src/gpgmetools.c:613 src/gpgmetools.c:630
+#: src/gpgmetools.c:944 src/gpgmetools.c:977
 msgid "Unknown"
 msgstr "Ì¤³ÎÇ§"
 
-#: src/gpgmetools.c:584
+#: src/gpgmetools.c:593
 msgid "Never"
 msgstr "ÉÔ¿®"
 
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:596
 msgid "Marginal"
 msgstr "°ìÉô"
 
-#: src/gpgmetools.c:590
+#: src/gpgmetools.c:599
 msgid "Full"
 msgstr "´°Á´"
 
-#: src/gpgmetools.c:593
+#: src/gpgmetools.c:602
 msgid "Ultimate"
 msgstr "µæ¶Ë"
 
-#: src/gpgmetools.c:619
+#: src/gpgmetools.c:628
 msgid "Incomplete"
 msgstr "ÉÔ´°Á´"
 
-#: src/gpgmetools.c:625
+#: src/gpgmetools.c:634
 msgid "Fully Valid"
 msgstr "´°Á´¤ËÍ¸ú"
 
-#: src/gpgmetools.c:659
+#: src/gpgmetools.c:668
 msgid "Please enter the passphrase for the following key:"
 msgstr "°Ê²¼¤Î¸°¤Î¥Ñ¥¹¥ï¡¼¥É¤òÆþÎÏ¤·¤Æ²¼¤µ¤¤:"
 
-#: src/gpgmetools.c:667
+#: src/gpgmetools.c:676
 msgid "Wrong passphrase, please try again:"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬°ã¤¤¤Þ¤¹¡£¤â¤¦°ìÅÙ¤ª´ê¤¤¤·¤Þ¤¹:"
 
-#: src/gpgmetools.c:692
+#: src/gpgmetools.c:701
 msgid "Enter Passphrase"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ"
 
-#: src/gpgmetools.c:814
+#: src/gpgmetools.c:826
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:904 src/verifydlg.c:269
+#: src/gpgmetools.c:916 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[Ì¤³ÎÇ§¥æ¡¼¥¶ ID]"
 
-#: src/gpgmetools.c:930 src/verifydlg.c:217
+#: src/gpgmetools.c:942 src/verifydlg.c:217
 msgid "Bad"
 msgstr "ÉÔÀµ"
 
-#: src/gpgmetools.c:953
+#: src/gpgmetools.c:965
 msgid "Generic"
 msgstr "°ìÈÌ"
 
-#: src/gpgmetools.c:956
+#: src/gpgmetools.c:968
 msgid "Persona"
 msgstr "¸Ä¿Í"
 
-#: src/gpgmetools.c:959
+#: src/gpgmetools.c:971
 msgid "Casual"
 msgstr "¥«¥¸¥å¥¢¥ë"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:974
 msgid "Positive"
 msgstr "¥Ý¥¸¥Æ¥£¥ô"
 
-#: src/gpgmetools.c:980
+#: src/gpgmetools.c:992
 msgid "The key can be used for certification, signing and encryption."
 msgstr "¾ÚÌÀ¡¢½ðÌ¾¡¢°Å¹æ²½¤Ë»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:983
+#: src/gpgmetools.c:995
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr "¾ÚÌÀ¤ª¤è¤Ó½ðÌ¾¤Ë»È¤¨¤Þ¤¹¤¬¡¢°Å¹æ²½¤Ë¤Ï»È¤¨¤Ê¤¤¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:1001
 msgid "The key can be used for certification and encryption."
 msgstr "¾ÚÌÀ¤È°Å¹æ²½¤Ë»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:1004
 msgid "The key can be used only for certification."
 msgstr "¾ÚÌÀ¤Ë¤Î¤ß»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:1000
+#: src/gpgmetools.c:1012
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
 msgstr "½ðÌ¾¤ª¤è¤Ó°Å¹æ²½¤Ë»È¤¨¤Þ¤¹¤¬¡¢¾ÚÌÀ¤Ë¤Ï»È¤¨¤Ê¤¤¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:1003
+#: src/gpgmetools.c:1015
 msgid "The key can be used only for signing."
 msgstr "½ðÌ¾¤Ë¤Î¤ß»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:1008
+#: src/gpgmetools.c:1020
 msgid "The key can be used only for encryption."
 msgstr "°Å¹æ²½¤Ë¤Î¤ß»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/gpgmetools.c:1011
+#: src/gpgmetools.c:1023
 msgid "This key is useless."
 msgstr "¤³¤Î¸°¤Ï»È¤¨¤Þ¤»¤ó¡£"
 
-#: src/gtktools.c:320
+#: src/gtktools.c:48
 msgid "GPA Error"
 msgstr "GPA ¥¨¥é¡¼"
 
-#: src/helpmenu.c:202
+#: src/helpmenu.c:83
 msgid "About GPA"
 msgstr "GPA ¤Ë¤Ä¤¤¤Æ"
 
-#: src/helpmenu.c:247
-msgid "Brought to you by:"
-msgstr "Äó¶¡¼Ô:"
+#: src/helpmenu.c:89
+#, fuzzy
+msgid "GPA is the GNU Privacy Assistant."
+msgstr "GNU Privacy Assistant ¤Ë¤Ä¤¤¤ÆÍý²ò¤¹¤ë"
 
-#: src/helpmenu.c:284
+#: src/icons.c:199
 #, fuzzy
-msgid "GPA is Free Software under the"
-msgstr "GPA is free software under the"
+msgid "_Verify"
+msgstr "¸¡¾Ú"
 
-#: src/helpmenu.c:288
-msgid "GNU General Public License."
-msgstr "GNU General Public License."
+#: src/icons.c:200
+msgid "_Encrypt"
+msgstr "°Å¹æ²½ (_E)"
 
-#: src/helpmenu.c:292
-msgid "For news see:"
-msgstr "ºÇ¿·¾ðÊó¤Ï¤³¤Á¤é:"
+#: src/icons.c:201
+#, fuzzy
+msgid "_Decrypt"
+msgstr "Éü¹æ²½"
 
-#: src/helpmenu.c:297
+#: src/icons.c:202
 #, fuzzy
-msgid "http://www.gpg4win.org"
-msgstr "http://www.gnupg.org"
+msgid "_Brief"
+msgstr "Í×Ìó"
 
-#: src/helpmenu.c:299
-msgid "http://www.gnupg.org"
-msgstr "http://www.gnupg.org"
+#: src/icons.c:203
+#, fuzzy
+msgid "_Detailed"
+msgstr "¾ÜºÙ"
 
-#: src/helpmenu.c:382
+#: src/icons.c:204
 #, fuzzy
-msgid "GNU General Public License"
-msgstr "GNU General Public License."
+msgid "_Keyring Editor"
+msgstr "¸°Â«¥¨¥Ç¥£¥¿"
 
-#: src/helpmenu.c:409
+#: src/icons.c:205
 #, fuzzy
-msgid "_GNU General Public License"
-msgstr "GNU General Public License."
+msgid "_Clipboard"
+msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼ (_C)"
 
-#: src/helpmenu.c:436
-msgid "Show Help Text\n"
-msgstr "¥Ø¥ë¥×¤ò¸«¤ë\n"
+#: src/icons.c:206
+#, fuzzy
+msgid "_File Manager"
+msgstr "¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã"
 
-#: src/helpmenu.c:444
-msgid "/_Help"
-msgstr "/¥Ø¥ë¥× (_H)"
-
-#: src/helpmenu.c:446
-msgid "/Help/_Contents"
-msgstr "/¥Ø¥ë¥× (H)/ÆâÍÆ (_C)"
-
-#: src/helpmenu.c:449
-msgid "/Help/_License"
-msgstr "/¥Ø¥ë¥× (H)/¥é¥¤¥»¥ó¥¹ (_L)"
-
-#: src/helpmenu.c:450
-msgid "/Help/_About"
-msgstr "/¥Ø¥ë¥× (H)/GPA ¤Ë¤Ä¤¤¤Æ (_A)"
-
 #: src/keydeletedlg.c:41
 msgid "Removing Secret Key"
 msgstr "ÈëÌ©¸°¤òºï½ü"
@@ -1290,23 +1016,27 @@
 msgid "Are you sure you want to delete this key?"
 msgstr "ËÜÅö¤Ë¤³¤Î¸°¤òºï½ü¤·¤Þ¤¹¤«?"
 
-#: src/keyeditdlg.c:149
+#: src/keyeditdlg.c:147
 msgid "Edit Key"
 msgstr "¸°¤òÊÔ½¸"
 
-#: src/keyeditdlg.c:165
+#: src/keyeditdlg.c:162
 msgid "Change _passphrase"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÊÑ¹¹ (_P)"
 
-#: src/keyeditdlg.c:185
+#: src/keyeditdlg.c:182
 msgid "Change _expiration"
 msgstr "Í¸ú´ü¸Â¤òÊÑ¹¹ (_E)"
 
-#: src/keygendlg.c:58
+#: src/keygendlg.c:67
+msgid "You must enter a key size."
+msgstr ""
+
+#: src/keygendlg.c:72
 msgid "You must enter a User ID."
 msgstr ""
 
-#: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
+#: src/keygendlg.c:77 src/passwddlg.c:45
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -1314,7 +1044,7 @@
 "\"¥Ñ¥¹¥ï¡¼¥É\" ¤È \"ºÆÆþÎÏ\" ¤Ë¤Ï\n"
 "Æ±¤¸¥Ñ¥¹¥ï¡¼¥É¤òÆþÎÏ¤·¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£"
 
-#: src/keygendlg.c:70 src/keygenwizard.c:314 src/passwddlg.c:52
+#: src/keygendlg.c:84 src/passwddlg.c:52
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1322,7 +1052,7 @@
 "¥Ñ¥¹¥ï¡¼¥É¤¬ÆþÎÏ¤µ¤ì¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 "ÈëÌ©¸°¤ò¼é¤ë¤¿¤á¤ËÉ¬Í×¤Ç¤¹¡£"
 
-#: src/keygendlg.c:83 src/keygenwizard.c:328 src/passwddlg.c:65
+#: src/keygendlg.c:97 src/passwddlg.c:65
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1334,23 +1064,25 @@
 "\n"
 "¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/keygendlg.c:88 src/keygenwizard.c:333 src/passwddlg.c:70
+#: src/keygendlg.c:102 src/passwddlg.c:70
 msgid "_Enter new passphrase"
 msgstr "¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ (_E)"
 
-#: src/keygendlg.c:89 src/keygenwizard.c:334 src/passwddlg.c:71
+#: src/keygendlg.c:104 src/passwddlg.c:71
 msgid "Take this one _anyway"
 msgstr "¤È¤Ë¤«¤¯¤³¤ì¤Ë¤¹¤ë (_A)"
 
-#: src/keygendlg.c:144 src/keygenwizard.c:541
+#: src/keygendlg.c:150 src/keygenwizard.c:571 src/keygenwizard.c:584
+#: src/keygenwizard.c:594 src/keygenwizard.c:604 src/keygenwizard.c:616
+#: src/keygenwizard.c:633 src/keygenwizard.c:645
 msgid "Generate key"
 msgstr "¸°¤òÀ¸À®"
 
-#: src/keygendlg.c:185
+#: src/keygendlg.c:177
 msgid "_Algorithm: "
 msgstr "¥¢¥ë¥´¥ê¥º¥à (_A): "
 
-#: src/keygendlg.c:197
+#: src/keygendlg.c:192
 msgid "_Key size (bits): "
 msgstr "¸°¤Î¥µ¥¤¥º (¥Ó¥Ã¥È) (_K): "
 
@@ -1366,27 +1098,27 @@
 msgid "2048"
 msgstr "2048"
 
-#: src/keygendlg.c:216
+#: src/keygendlg.c:206
 msgid "_User ID: "
 msgstr "¥æ¡¼¥¶ ID (_U): "
 
-#: src/keygendlg.c:226
+#: src/keygendlg.c:217
 msgid "_Email: "
 msgstr "_E ¥á¡¼¥ë: "
 
-#: src/keygendlg.c:236
+#: src/keygendlg.c:226
 msgid "_Comment: "
 msgstr "¥³¥á¥ó¥È (_C): "
 
-#: src/keygendlg.c:248
+#: src/keygendlg.c:235
 msgid "_Passphrase: "
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º (_P): "
 
-#: src/keygendlg.c:260
+#: src/keygendlg.c:246
 msgid "_Repeat passphrase: "
 msgstr "ºÆÆþÎÏ (_R): "
 
-#: src/keygenwizard.c:152
+#: src/keygenwizard.c:172
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1397,19 +1129,16 @@
 "\n"
 "Â¾¤Î¿Í¤¬¸°¤òÍÆ°×¤Ë¼±ÊÌ¤Ç¤¤ë¤è¤¦¤Ë¡¢Ì¾Á°¤ò¿·¤·¤¤¸°¤Î°ìÉô¤Ë¤·¤Þ¤¹"
 
-#: src/keygenwizard.c:157
+#: src/keygenwizard.c:175
 msgid "Your Name:"
 msgstr "»áÌ¾:"
 
-#: src/keygenwizard.c:170
-msgid "Please insert your name"
-msgstr "»áÌ¾¤òµÆþ¤·¤Æ¤¯¤À¤µ¤¤"
-
-#: src/keygenwizard.c:183
+#: src/keygenwizard.c:211
+#, fuzzy
 msgid ""
 "Please insert your email address.\n"
 "\n"
-" Your email address will be part of the new key to make it easier for others "
+"Your email address will be part of the new key to make it easier for others "
 "to identify keys. If you have several email addresses, you can add further "
 "email adresses later."
 msgstr ""
@@ -1418,27 +1147,40 @@
 "Â¾¤Î¿Í¤¬¸°¤ò´ÊÃ±¤Ë¼±ÊÌ¤Ç¤¤ë¤è¤¦¤Ë¡¢E ¥á¡¼¥ë¥¢¥É¥ì¥¹¤ò¿·¤·¤¤¸°¤Î°ìÉô¤Ë¤·¤Þ"
 "¤¹¡£E ¥á¡¼¥ë¥¢¥É¥ì¥¹¤òÊ£¿ô»ý¤Ã¤Æ¤¤¤ë¤Î¤Ê¤é¡¢»Ä¤ê¤Ï¸å¤ÇÄÉ²Ã¤Ç¤¤Þ¤¹¡£"
 
-#: src/keygenwizard.c:190
+#: src/keygenwizard.c:215
 msgid "Your Email Address:"
 msgstr "E ¥á¡¼¥ë¥¢¥É¥ì¥¹:"
 
-#: src/keygenwizard.c:205
-msgid "Please insert your email address"
-msgstr "E ¥á¡¼¥ë¥¢¥É¥ì¥¹¤òµÆþ¤·¤Æ²¼¤µ¤¤"
-
-#: src/keygenwizard.c:239
+#: src/keygenwizard.c:319
 msgid "Please choose a passphrase for the new key."
 msgstr "¿·¤·¤¤¸°¤Î¤¿¤á¤Î¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎÏ¤·¤Æ²¼¤µ¤¤¡£"
 
-#: src/keygenwizard.c:248 src/passwddlg.c:108
+#: src/keygenwizard.c:326
+#, fuzzy
+msgid ""
+"In \"Passphrase\" and \"Repeat passphrase\", you must enter the same "
+"passphrase."
+msgstr ""
+"\"¥Ñ¥¹¥ï¡¼¥É\" ¤È \"ºÆÆþÎÏ\" ¤Ë¤Ï\n"
+"Æ±¤¸¥Ñ¥¹¥ï¡¼¥É¤òÆþÎÏ¤·¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡£"
+
+#: src/keygenwizard.c:335
+msgid "Warning: The passphrase you have entered is not very secure."
+msgstr ""
+
+#: src/keygenwizard.c:350
+msgid "Quality: "
+msgstr ""
+
+#: src/keygenwizard.c:358 src/passwddlg.c:111
 msgid "Passphrase: "
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º: "
 
-#: src/keygenwizard.c:261 src/passwddlg.c:117
+#: src/keygenwizard.c:370 src/passwddlg.c:120
 msgid "Repeat Passphrase: "
 msgstr "ºÆÆþÎÏ: "
 
-#: src/keygenwizard.c:358
+#: src/keygenwizard.c:412
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1448,15 +1190,15 @@
 "¿·¤·¤¤¸°¤¬½ÐÍè¾å¤¬¤Ã¤¿¤é¡¢¥Ð¥Ã¥¯¥¢¥Ã¥×¥³¥Ô¡¼¤òºîÀ®¤¹¤ë¤³¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£\n"
 "¥Ð¥Ã¥¯¥¢¥Ã¥×¥³¥Ô¡¼¤òºî¤ê¤Þ¤¹¤«¡©"
 
-#: src/keygenwizard.c:367
+#: src/keygenwizard.c:420
 msgid "Create _backup copy"
 msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¤ÎºîÀ® (_B)"
 
-#: src/keygenwizard.c:374 src/keyring.c:739 src/keyring.c:767
+#: src/keygenwizard.c:425 src/keyring.c:737 src/keyring.c:763
 msgid "Do it _later"
 msgstr "¸å¤Ç (_L)"
 
-#: src/keygenwizard.c:402
+#: src/keygenwizard.c:454
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1466,7 +1208,7 @@
 "\n"
 "¹âÂ®¤Ê¥³¥ó¥Ô¥å¡¼¥¿¤Ç¤â¤·¤Ð¤é¤¯¤«¤«¤ê¤Þ¤¹¡£²æËý¤·¤Æ²¼¤µ¤¤¡£"
 
-#: src/keygenwizard.c:411
+#: src/keygenwizard.c:463
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1484,44 +1226,44 @@
 "GnuPG ¤Ï¿®ÍÑÅÙ¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Æ¤¤¤Þ¤¹¡£\n"
 "¤·¤Ð¤é¤¯¤ªÂÔ¤Á¤¯¤À¤µ¤¤¡£"
 
-#: src/keylist.c:559
+#: src/keylist.c:547
 msgid ""
 "This columns lists the type of the certificate.  A 'P' denotes OpenPGP and a "
 "'X' denotes X.509 (S/MIME)."
 msgstr ""
 
-#: src/keylist.c:568
+#: src/keylist.c:556
 #, fuzzy
 msgid "The key ID is a short number to identify a certificate."
 msgstr "¾ÚÌÀ¤Ë¤Î¤ß»È¤¨¤ë¸°¤Ç¤¹¡£"
 
-#: src/keylist.c:581
+#: src/keylist.c:569
 msgid "The Expiry Date is the date until the certificate is valid."
 msgstr ""
 
-#: src/keylist.c:591 src/ownertrustdlg.c:122
+#: src/keylist.c:579 src/ownertrustdlg.c:123
 msgid "Owner Trust"
 msgstr "½êÍ¼Ô¤Î¿®ÍÑÅÙ"
 
-#: src/keylist.c:592
+#: src/keylist.c:580
 msgid ""
 "The Owner Trust has been set by you and describes how far you trust the "
 "holder of the certificate to correctly sign (certify) other certificates.  "
 "It is only meaningful for OpenPGP."
 msgstr ""
 
-#: src/keylist.c:604
+#: src/keylist.c:592
 #, fuzzy
 msgid "Validity"
 msgstr "¸°¤ÎÍ¸úÀ"
 
-#: src/keylist.c:605
+#: src/keylist.c:593
 msgid ""
 "The Validity describes the trust level the system has in this certificate.  "
 "That is how sure it is that the named user is actually that user."
 msgstr ""
 
-#: src/keylist.c:619
+#: src/keylist.c:607
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
@@ -1531,18 +1273,18 @@
 msgid "No keys selected for signing."
 msgstr "½ðÌ¾¤¹¤ë¸°¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/keyring.c:734
+#: src/keyring.c:732
 msgid ""
 "You do not have a private key yet. Do you want to generate one now "
 "(recommended) or do it later?"
 msgstr ""
 "¤Þ¤ÀÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó¡£º£¤¹¤°ºîÀ®¤·¤Þ¤¹¤« (¢«¿ä¾©)¡¢¤½¤ì¤È¤â¸å¤Ë¤·¤Þ¤¹¤«?"
 
-#: src/keyring.c:738
+#: src/keyring.c:736
 msgid "_Generate key now"
 msgstr "º£¤¹¤°¸°¤òºîÀ®¤¹¤ë (_G)"
 
-#: src/keyring.c:761
+#: src/keyring.c:757
 msgid ""
 "You do not have a backup copy of your private key yet. Do you want to backup "
 "your key now (recommended) or do it later?"
@@ -1550,357 +1292,265 @@
 "¤Þ¤ÀÈëÌ©¸°¤Î¥Ð¥Ã¥¯¥¢¥Ã¥×¤¬¤¢¤ê¤Þ¤»¤ó¡£º£¤¹¤°¸°¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×¤·¤Þ¤¹¤« (¢«¿ä"
 "¾©)¡¢¤½¤ì¤È¤â¸å¤Ë¤·¤Þ¤¹¤«¡©"
 
-#: src/keyring.c:766
+#: src/keyring.c:762
 msgid "_Backup key now"
 msgstr "º£¤¹¤°¸°¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×¤¹¤ë (_B)"
 
-#: src/keyring.c:883
-msgid "/_Keys"
-msgstr "/¸° (_K)"
-
-#: src/keyring.c:884
-msgid "/Keys/_Refresh"
-msgstr ""
-
 #: src/keyring.c:886
 #, fuzzy
-msgid "/Keys/sep0"
-msgstr "/¸° (K)/sep1"
+msgid "_Keys"
+msgstr "/¸° (_K)"
 
 #: src/keyring.c:887
-msgid "/Keys/_New Key..."
-msgstr "/¸° (K)/¸°¤òºîÀ®... (_N)"
+#, fuzzy
+msgid "_Server"
+msgstr "/¥µ¡¼¥Ð (_S)"
 
-#: src/keyring.c:889
-msgid "/Keys/_Delete Keys..."
-msgstr "/¸° (K)/¸°¤òºï½ü... (_D)"
+#: src/keyring.c:901
+#, fuzzy
+msgid "Select all certificates"
+msgstr "¼º¸ú¾ÚÌÀ¤ÎÀ¸À® (_V)"
 
-#: src/keyring.c:891
-msgid "/Keys/sep1"
-msgstr "/¸° (K)/sep1"
+#: src/keyring.c:906
+msgid "Refresh the keyring"
+msgstr ""
 
-#: src/keyring.c:892
-msgid "/Keys/_Sign Keys..."
-msgstr "/¸° (K)/¸°¤Ë½ðÌ¾... (_S)"
+#: src/keyring.c:907
+#, fuzzy
+msgid "_New key..."
+msgstr "/¸° (K)/¸°¤òºîÀ®... (_N)"
 
-#: src/keyring.c:893
-msgid "/Keys/Set _Owner Trust..."
-msgstr "/¸° (K)/½êÍ¼Ô¤Î¿®ÍÑÅÙ¤ò»ØÄê... (_O)"
+#: src/keyring.c:908
+#, fuzzy
+msgid "Generate a new key"
+msgstr "¸°¤òÀ¸À®"
 
-#: src/keyring.c:894
-msgid "/Keys/_Edit Private Key..."
-msgstr "/¸° (K)/ÈëÌ©¸°¤òÊÔ½¸... (_E)"
+#: src/keyring.c:909
+#, fuzzy
+msgid "_Delete keys"
+msgstr "/¸°¤òºï½ü... (_D)"
 
-#: src/keyring.c:895
-msgid "/Keys/sep2"
-msgstr "/¸° (K)/sep2"
+#: src/keyring.c:910
+msgid "Remove the selected key"
+msgstr "ÁªÂò¤µ¤ì¤¿¸°¤òºï½ü"
 
-#: src/keyring.c:896
-msgid "/Keys/_Import Keys..."
-msgstr "/¸° (K)/¸°¤ò¥¤¥ó¥Ý¡¼¥È... (_I)"
+#: src/keyring.c:911
+#, fuzzy
+msgid "_Sign Keys..."
+msgstr "/¸°¤Ë½ðÌ¾... (_S)"
 
-#: src/keyring.c:897
-msgid "/Keys/E_xport Keys..."
-msgstr "/¸° (K)/¸°¤ò¥¨¥¯¥¹¥Ý¡¼¥È... (_X)"
+#: src/keyring.c:912
+msgid "Sign the selected key"
+msgstr "ÁªÂò¤µ¤ì¤¿¸°¤Ë½ðÌ¾¤¹¤ë"
 
-#: src/keyring.c:898
-msgid "/Keys/_Backup..."
-msgstr "/¸° (K)/¥Ð¥Ã¥¯¥¢¥Ã¥×... (_B)"
+#: src/keyring.c:913
+#, fuzzy
+msgid "Set _Owner Trust..."
+msgstr "/½êÍ¼Ô¤Î¿®ÍÑÅÙ¤ò»ØÄê... (_O)"
 
-#: src/keyring.c:901
-msgid "/_Server"
-msgstr "/¥µ¡¼¥Ð (_S)"
+#: src/keyring.c:914
+#, fuzzy
+msgid "Set owner trust of the selected key"
+msgstr "ÁªÂò¤µ¤ì¤¿¸°¤òºï½ü"
 
-#: src/keyring.c:902
-msgid "/Server/_Retrieve Keys..."
-msgstr "/¥µ¡¼¥Ð (S)/¸°¤ò¼èÆÀ... (_R)"
+#: src/keyring.c:916
+#, fuzzy
+msgid "_Edit Private Key..."
+msgstr "/ÈëÌ©¸°¤òÊÔ½¸... (_E)"
 
-#: src/keyring.c:903
-msgid "/Server/_Send Keys..."
-msgstr "/¥µ¡¼¥Ð (S)/¸°¤òÁ÷¿®... (_S)"
+#: src/keyring.c:917
+msgid "Edit the selected private key"
+msgstr "ÁªÂò¤µ¤ì¤¿ÈëÌ©¸°¤òÊÔ½¸"
 
-#: src/keyring.c:908
+#: src/keyring.c:919
 #, fuzzy
-msgid "/Windows/_File Manager"
-msgstr "/¥¦¥£¥ó¥É¥¦ (W)/¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã (_F)"
+msgid "_Import Keys..."
+msgstr "¸°¤ò¥¤¥ó¥Ý¡¼¥È"
 
-#: src/keyring.c:939
-msgid "/Keys/Export Keys..."
-msgstr "/¸° (K)/¸°¤ò¥¨¥¯¥¹¥Ý¡¼¥È... (X)"
+#: src/keyring.c:920
+msgid "Import Keys"
+msgstr "¸°¤ò¥¤¥ó¥Ý¡¼¥È"
 
-#: src/keyring.c:944
-msgid "/Keys/Delete Keys..."
-msgstr "/¸° (K)/¸°¤òºï½ü... (D)"
+#: src/keyring.c:921
+#, fuzzy
+msgid "E_xport Keys..."
+msgstr "/¸°¤ò¥¨¥¯¥¹¥Ý¡¼¥È... (_X)"
 
-#: src/keyring.c:952
-msgid "/Server/Send Keys..."
-msgstr "/¥µ¡¼¥Ð (S)/¸°¤òÁ÷¿®... (S)"
+#: src/keyring.c:922
+msgid "Export Keys"
+msgstr "¸°¤ò¥¨¥¯¥¹¥Ý¡¼¥È"
 
-#: src/keyring.c:959
-msgid "/Keys/Set Owner Trust..."
-msgstr "/¸° (K)/½êÍ¼Ô¤Î¿®ÍÑÅÙ¤ò»ØÄê... (O)"
+#: src/keyring.c:923
+#, fuzzy
+msgid "_Backup..."
+msgstr "/¥Ð¥Ã¥¯¥¢¥Ã¥×... (_B)"
 
-#: src/keyring.c:966
-msgid "/Keys/Sign Keys..."
-msgstr "/¸° (K)/¸°¤Ë½ðÌ¾... (S)"
+#: src/keyring.c:924
+#, fuzzy
+msgid "Backup key"
+msgstr "¸°¤ò¥Ð¥Ã¥¯¥¢¥Ã¥×"
 
-#: src/keyring.c:972
-msgid "/Keys/Edit Private Key..."
-msgstr "/¸° (K)/ÈëÌ©¸°¤òÊÔ½¸... (E)"
+#: src/keyring.c:927
+#, fuzzy
+msgid "_Retrieve Keys..."
+msgstr "/¥µ¡¼¥Ð (S)/¸°¤ò¼èÆÀ... (_R)"
 
-#: src/keyring.c:977
-msgid "/Keys/Backup..."
-msgstr "/¸° (K)/¥Ð¥Ã¥¯¥¢¥Ã¥×... (B)"
+#: src/keyring.c:928
+#, fuzzy
+msgid "Retrieve keys from server"
+msgstr "¸°¤ò¥µ¡¼¥Ð¤«¤é¼õ¿®"
 
-#: src/keyring.c:994
-msgid "/_Copy"
-msgstr "/¥³¥Ô¡¼ (_C)"
-
-#: src/keyring.c:996
-msgid "/_Paste"
-msgstr "/Å½¤êÉÕ¤± (_P)"
-
-#: src/keyring.c:998
-msgid "/_Delete Keys..."
-msgstr "/¸°¤òºï½ü... (_D)"
-
-#: src/keyring.c:1001
-msgid "/_Sign Keys..."
+#: src/keyring.c:930
+#, fuzzy
+msgid "_Send Keys..."
 msgstr "/¸°¤Ë½ðÌ¾... (_S)"
 
-#: src/keyring.c:1002
-msgid "/Set _Owner Trust..."
-msgstr "/½êÍ¼Ô¤Î¿®ÍÑÅÙ¤ò»ØÄê... (_O)"
+#: src/keyring.c:931
+#, fuzzy
+msgid "Send keys to server"
+msgstr "/¸°¤ò¥µ¡¼¥Ð¤ØÁ÷¿®... (_N)"
 
-#: src/keyring.c:1003
-msgid "/_Edit Private Key..."
-msgstr "/ÈëÌ©¸°¤òÊÔ½¸... (_E)"
+#: src/keyring.c:937
+msgid "Show Brief Keylist"
+msgstr "Í×ÌóÈÇ¤Î¸°¥ê¥¹¥È¤òÉ½¼¨"
 
-#: src/keyring.c:1005
-msgid "/E_xport Keys..."
-msgstr "/¸°¤ò¥¨¥¯¥¹¥Ý¡¼¥È... (_X)"
+#: src/keyring.c:939
+msgid "Show Key Details"
+msgstr "¸°¤Î¾ÜºÙ¤òÉ½¼¨"
 
-#: src/keyring.c:1006
-msgid "/Se_nd Keys to Server..."
-msgstr "/¸°¤ò¥µ¡¼¥Ð¤ØÁ÷¿®... (_N)"
+#: src/keyring.c:1063
+msgid "Edit"
+msgstr "ÊÔ½¸"
 
-#: src/keyring.c:1007
-msgid "/_Backup..."
-msgstr "/¥Ð¥Ã¥¯¥¢¥Ã¥×... (_B)"
+#: src/keyring.c:1065
+msgid "Delete"
+msgstr "ºï½ü"
 
-#: src/keyring.c:1018
-msgid "/Set Owner Trust..."
-msgstr "/½êÍ¼Ô¤Î¿®ÍÑÅÙ¤ò»ØÄê... (O)"
+#: src/keyring.c:1067
+msgid "Sign"
+msgstr "½ðÌ¾¤¹¤ë"
 
-#: src/keyring.c:1025
-msgid "/Sign Keys..."
-msgstr "/¸°¤Ë½ðÌ¾... (S)"
+#: src/keyring.c:1069
+msgid "Export"
+msgstr "¥¨¥¯¥¹¥Ý¡¼¥È"
 
-#: src/keyring.c:1031
-msgid "/Edit Private Key..."
-msgstr "/ÈëÌ©¸°¤òÊÔ½¸... (E)"
+#: src/keyring.c:1071
+msgid "Import"
+msgstr "¥¤¥ó¥Ý¡¼¥È"
 
-#: src/keyring.c:1036
-msgid "/Backup..."
-msgstr "/¥Ð¥Ã¥¯¥¢¥Ã¥×... (B)"
-
-#: src/keyring.c:1106
+#: src/keyring.c:1178
 msgid "Subkeys"
 msgstr "Éû¸°"
 
-#: src/keyring.c:1180 src/keysigndlg.c:110
+#: src/keyring.c:1252 src/keysigndlg.c:106
 msgid "Fingerprint:"
 msgstr "»ØÌæ:"
 
-#: src/keyring.c:1182
+#: src/keyring.c:1254
 msgid "Expires at:"
 msgstr "Í¸ú´ü¸Â:"
 
-#: src/keyring.c:1184
+#: src/keyring.c:1256
 msgid "Owner Trust:"
 msgstr "½êÍ¼Ô¤Î¿®ÍÑÅÙ:"
 
-#: src/keyring.c:1186
+#: src/keyring.c:1258
 msgid "Key Validity:"
 msgstr "¸°¤ÎÍ¸úÀ:"
 
-#: src/keyring.c:1188
+#: src/keyring.c:1260
 msgid "Key Type:"
 msgstr "¸°¥¿¥¤¥×:"
 
-#: src/keyring.c:1190
+#: src/keyring.c:1262
 msgid "Created at:"
 msgstr "ºîÀ®Æü:"
 
-#: src/keyring.c:1193
+#: src/keyring.c:1265
 msgid "Details"
 msgstr "¾ÜºÙ"
 
-#: src/keyring.c:1201
+#: src/keyring.c:1273
 msgid "Show signatures on user name:"
 msgstr "¥æ¡¼¥¶Ì¾¤ËÂÐ¤¹¤ë½ðÌ¾¤òÉ½¼¨"
 
-#: src/keyring.c:1225
+#: src/keyring.c:1298
 msgid "Signatures"
 msgstr "½ðÌ¾"
 
-#: src/keyring.c:1249
+#: src/keyring.c:1322
 msgid "The key has both a private and a public part"
 msgstr "¤³¤Î¸°¤ÏÈëÌ©¸°¤È¸ø³«¸°¤¬¤¢¤ë"
 
-#: src/keyring.c:1252
+#: src/keyring.c:1325
 msgid "The key has only a public part"
 msgstr "¤³¤Î¸°¤Ï¸ø³«¸°¤·¤«¤Ê¤¤"
 
-#: src/keyring.c:1287
+#: src/keyring.c:1360
 #, c-format
 msgid "%s %u bits"
 msgstr "%s %u ¥Ó¥Ã¥È"
 
-#: src/keyring.c:1312
+#: src/keyring.c:1385
 msgid "No keys selected"
 msgstr "¸°¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/keyring.c:1315
+#: src/keyring.c:1388
 #, fuzzy, c-format
 msgid "%d key selected"
 msgid_plural "%d keys selected"
 msgstr[0] "%d ¸Ä¤Î¸°¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤¹"
 msgstr[1] "%d ¸Ä¤Î¸°¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: src/keyring.c:1347
+#: src/keyring.c:1423
 msgid "All signatures"
 msgstr "¤¹¤Ù¤Æ¤Î½ðÌ¾"
 
-#: src/keyring.c:1552
-msgid "Edit"
-msgstr "ÊÔ½¸"
-
-#: src/keyring.c:1553
-msgid "Edit the selected private key"
-msgstr "ÁªÂò¤µ¤ì¤¿ÈëÌ©¸°¤òÊÔ½¸"
-
-#: src/keyring.c:1554
-msgid "edit key"
-msgstr "¸°¤òÊÔ½¸"
-
-#: src/keyring.c:1562
-msgid "Remove the selected key"
-msgstr "ÁªÂò¤µ¤ì¤¿¸°¤òºï½ü"
-
-#: src/keyring.c:1563
-msgid "remove key"
-msgstr "¸°¤òºï½ü"
-
-#: src/keyring.c:1571
-msgid "Sign the selected key"
-msgstr "ÁªÂò¤µ¤ì¤¿¸°¤Ë½ðÌ¾¤¹¤ë"
-
-#: src/keyring.c:1571
-msgid "sign key"
-msgstr "¸°¤Ë½ðÌ¾"
-
 #: src/keyring.c:1578
-msgid "Import"
-msgstr "¥¤¥ó¥Ý¡¼¥È"
-
-#: src/keyring.c:1579
-msgid "Import Keys"
-msgstr "¸°¤ò¥¤¥ó¥Ý¡¼¥È"
-
-#: src/keyring.c:1579
-msgid "import keys"
-msgstr "¸°¥¤¥ó¥Ý¡¼¥È"
-
-#: src/keyring.c:1584
-msgid "Export"
-msgstr "¥¨¥¯¥¹¥Ý¡¼¥È"
-
-#: src/keyring.c:1585
-msgid "Export Keys"
-msgstr "¸°¤ò¥¨¥¯¥¹¥Ý¡¼¥È"
-
-#: src/keyring.c:1585
-msgid "export keys"
-msgstr "¸°¥¨¥¯¥¹¥Ý¡¼¥È"
-
-#: src/keyring.c:1598
-msgid "Brief"
-msgstr "Í×Ìó"
-
-#: src/keyring.c:1598
-msgid "Show Brief Keylist"
-msgstr "Í×ÌóÈÇ¤Î¸°¥ê¥¹¥È¤òÉ½¼¨"
-
-#: src/keyring.c:1599
-msgid "brief"
-msgstr "Í×Ìó"
-
-#: src/keyring.c:1610
-msgid "Detailed"
-msgstr "¾ÜºÙ"
-
-#: src/keyring.c:1610
-msgid "Show Key Details"
-msgstr "¸°¤Î¾ÜºÙ¤òÉ½¼¨"
-
-#: src/keyring.c:1611
-msgid "detailed"
-msgstr "¾ÜºÙ"
-
-#: src/keyring.c:1639
-msgid "Refresh the keyring"
-msgstr ""
-
-#: src/keyring.c:1640
-msgid "refresh keyring"
-msgstr ""
-
-#: src/keyring.c:1711
 #, fuzzy
 msgid "Selected default key:"
 msgstr "ÁªÂò¤µ¤ì¤¿¥Ç¥Õ¥©¥ë¥È¤Î¸°:"
 
-#: src/keyring.c:1721
+#: src/keyring.c:1588
 #, fuzzy
 msgid "No default key selected in the preferences."
 msgstr "ÊÝ¸î¤¹¤ë¥Õ¥¡¥¤¥ë¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/keyring.c:1833
+#: src/keyring.c:1701
 msgid "GNU Privacy Assistant - Keyring Editor"
 msgstr "GNU Privacy Assistant - ¸°Â«¥¨¥Ç¥£¥¿"
 
-#: src/keyring.c:1865
+#: src/keyring.c:1728
 msgid "Keyring Editor"
 msgstr "¸°Â«¥¨¥Ç¥£¥¿"
 
-#: src/keysigndlg.c:60
+#: src/keysigndlg.c:59
 msgid "Sign Key"
 msgstr "¸°¤Ë½ðÌ¾"
 
-#: src/keysigndlg.c:76
+#: src/keysigndlg.c:72
 msgid "Do you want to sign the following key?"
 msgstr "°Ê²¼¤Î¸°¤Ë½ðÌ¾¤·¤Þ¤¹¤«?"
 
-#: src/keysigndlg.c:120
+#: src/keysigndlg.c:116
 msgid ""
 "Check the name and fingerprint carefully to be sure that it really is the "
 "key you want to sign."
 msgstr "ËÜÅö¤Ë¤½¤ì¤¬½ðÌ¾¤·¤¿¤¤¸°¤Ê¤Î¤«¡¢Ì¾Á°¤È»ØÌæ¤ò¤è¤¯¸«¤Æ³ÎÇ§¤·¤Æ²¼¤µ¤¤¡£"
 
-#: src/keysigndlg.c:128
+#: src/keysigndlg.c:124
 msgid "All user names in this key will be signed."
 msgstr "¤³¤Î¸°¤Ë¤¢¤ë¥æ¡¼¥¶Ì¾¤Ï¡¢¤¹¤Ù¤Æ½ðÌ¾¤µ¤ì¤Þ¤¹¡£"
 
-#: src/keysigndlg.c:134
+#: src/keysigndlg.c:130
 msgid "The key will be signed with your default private key."
 msgstr "¤³¤Î¸°¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎÈëÌ©¸°¤Ç½ðÌ¾¤µ¤ì¤Þ¤¹¡£"
 
-#: src/keysigndlg.c:141
+#: src/keysigndlg.c:137
 msgid "Sign only _locally"
 msgstr "¥í¡¼¥«¥ë¤Ç¤À¤±½ðÌ¾ (_L)"
 
-#: src/options.c:316
+#: src/options.c:323
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -1908,37 +1558,37 @@
 "¥Ç¥Õ¥©¥ë¥È¤È¤·¤ÆÁª¤ó¤Ç¤¢¤ë¸°¤¬¡¢¤â¤¦»È¤¨¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 "GPA ¤Ï¡¢¿·¤·¤¤¥Ç¥Õ¥©¥ë¥È¸°¤ò¼«Æ°ÁªÂò¤·¤Æ¤ß¤Þ¤¹¡£"
 
-#: src/ownertrustdlg.c:106
+#: src/ownertrustdlg.c:107
 msgid "Change key ownertrust"
 msgstr "¸°¤Î½êÍ¼Ô¿®ÍÑÅÙ¤òÊÑ¹¹"
 
-#: src/ownertrustdlg.c:130
+#: src/ownertrustdlg.c:131
 msgid "_Unknown"
 msgstr "Ì¤³ÎÇ§ (_U)"
 
-#: src/ownertrustdlg.c:135
+#: src/ownertrustdlg.c:136
 msgid ""
 "You don't know how much to trust this user to verify other people's keys.\n"
 msgstr ""
 "Â¾¤Î¿Í¤¿¤Á¤Î¸°¤ò¸¡¾Ú¤¹¤ëºÝ¤Ë¤³¤Î¥æ¡¼¥¶¤ò¤É¤ì¤À¤±¿®ÍÑ¤¹¤ë¤«¤Ï·è¤Þ¤Ã¤Æ¤¤¤Ê¤¤¤È"
 "¤¤¤¦¤³¤È¤Ç¤¹¡£\n"
 
-#: src/ownertrustdlg.c:145
+#: src/ownertrustdlg.c:146
 msgid "_Never"
 msgstr "ÉÔ¿® (_N)"
 
-#: src/ownertrustdlg.c:150
+#: src/ownertrustdlg.c:151
 msgid ""
 "You don't trust this user at all to verify the validity of other people's "
 "keys at all.\n"
 msgstr ""
 "Â¾¤Î¿Í¤¿¤Á¤Î¸°¤ò¸¡¾Ú¤¹¤ëºÝ¤Ë¤Ï¡¢¤³¤Î¥æ¡¼¥¶¤ò°ìÀÚ¿®ÍÑ¤·¤Ê¤¤¤È¤¤¤¦¤³¤È¤Ç¤¹¡£\n"
 
-#: src/ownertrustdlg.c:160
+#: src/ownertrustdlg.c:161
 msgid "_Marginal"
 msgstr "°ìÉô (_M)"
 
-#: src/ownertrustdlg.c:165
+#: src/ownertrustdlg.c:166
 msgid ""
 "You don't trust this user's ability to verify the validity of other people's "
 "keys enough to consider keys valid based on his/her sole word.\n"
@@ -1951,11 +1601,11 @@
 "¤È¤Ï¤¤¤¨¡¢¤³¤Î¥æ¡¼¥¶¤Î¸°¤¬Í¸ú¤Ç¤¢¤ì¤Ð¡¢¤³¤Î¥æ¡¼¥¶¤ÈÂ¾¤Î 2 ¿Í°Ê¾å¤Î¡Ö°ìÉô¡×Åª"
 "¤Ê¿®ÍÑÅÙ¤Î¿Í¤ÎÍ¸ú¤Ê¸°¤Ë¤è¤Ã¤Æ½ðÌ¾¤µ¤ì¤¿¸°¤òÍ¸ú¤È¤ß¤Ê¤·¤Þ¤¹¡£\n"
 
-#: src/ownertrustdlg.c:182
+#: src/ownertrustdlg.c:183
 msgid "_Full"
 msgstr "´°Á´ (_F)"
 
-#: src/ownertrustdlg.c:187
+#: src/ownertrustdlg.c:188
 msgid ""
 "You trust this user's ability to verify the validity of other people's keys "
 "so much, that you'll consider valid any key signed by him/her, provided this "
@@ -1965,11 +1615,11 @@
 "¸°¤ò¤¹¤Ù¤ÆÍ¸ú¤È¤ß¤Ê¤¹¤È¤¤¤¦¤³¤È¤Ç¤¹¡£¤¿¤À¤·¡¢¤³¤Î¥æ¡¼¥¶¤Î¸°¤¬Í¸ú¤Ç¤¢¤ì¤Ð¡¢"
 "¤Ç¤¹¡£\n"
 
-#: src/ownertrustdlg.c:200
+#: src/ownertrustdlg.c:201
 msgid "U_ltimate"
 msgstr "µæ¶Ë (_L)"
 
-#: src/ownertrustdlg.c:205
+#: src/ownertrustdlg.c:206
 msgid ""
 "You consider this key valid, and trust the user so much that you will "
 "consider any key signed by him/her fully valid.\n"
@@ -2060,37 +1710,149 @@
 "»ØÄê¤µ¤ì¤¿¥×¥í¥È¥³¥ë¤Î¸°¥µ¡¼¥Ð¤Ë\n"
 "»È¤¨¤ë¥×¥é¥°¥¤¥ó¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: src/server_access.c:528 src/server_access.c:574
+#: src/server_access.c:528 src/server_access.c:572
 msgid "The keyserver you specified is not valid"
 msgstr "»ØÄê¤µ¤ì¤¿¸°¥µ¡¼¥Ð¤ÏÌµ¸ú¤Ç¤¹"
 
-#: src/settingsdlg.c:59
+#: src/settingsdlg.c:133 src/siglist.c:135
+msgid "Local"
+msgstr "¥í¡¼¥«¥ë"
+
+#: src/settingsdlg.c:134
 #, fuzzy
+msgid "Local, Keyserver"
+msgstr "¸°¥µ¡¼¥Ð¡¼ (_K):"
+
+#: src/settingsdlg.c:135
+#, fuzzy
+msgid "Local, PKA"
+msgstr "¥í¡¼¥«¥ë"
+
+#: src/settingsdlg.c:136
+msgid "Local, PKA, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:137
+msgid "Local, Keyserver, PKA"
+msgstr ""
+
+#: src/settingsdlg.c:138
+#, fuzzy
+msgid "Local, kDNS"
+msgstr "¥í¡¼¥«¥ë"
+
+#: src/settingsdlg.c:139
+msgid "Local, kDNS, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:140
+msgid "PKA"
+msgstr ""
+
+#: src/settingsdlg.c:141
+msgid "kDNS"
+msgstr ""
+
+#: src/settingsdlg.c:142
+msgid "Custom"
+msgstr ""
+
+#: src/settingsdlg.c:208
+#, fuzzy
+msgid "<b>User interface</b>"
+msgstr "¾åµé¼Ô¥â¡¼¥É¤ò»È¤¦ (_A):"
+
+#: src/settingsdlg.c:215
+#, fuzzy
+msgid "Use _advanced mode"
+msgstr "¾åµé¼Ô¥â¡¼¥É¤ò»È¤¦ (_A):"
+
+#: src/settingsdlg.c:221
+#, fuzzy
+msgid "Show advanced _options"
+msgstr "¥Õ¥¡¥¤¥ëÆ°ºî¤òÉ½¼¨"
+
+#: src/settingsdlg.c:272
+msgid ""
+"No default key has been selected.  This may lead to problems when signing or "
+"encrypting.  For example you might later not be able to read a mail written "
+"by you and encrypted to someone else.\n"
+"\n"
+"Please consider creating your own key and select it then."
+msgstr ""
+
+#: src/settingsdlg.c:278
+msgid "Continue without a default key"
+msgstr ""
+
+#: src/settingsdlg.c:280
+#, fuzzy
+msgid "Let me select a default key"
+msgstr "ÁªÂò¤µ¤ì¤¿¥Ç¥Õ¥©¥ë¥È¤Î¸°:"
+
+#: src/settingsdlg.c:305
+#, fuzzy
 msgid "<b>Default _key</b>"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¸° (_K):"
 
-#: src/settingsdlg.c:111
+#: src/settingsdlg.c:405
 #, fuzzy
 msgid "<b>Default key_server</b>"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¸°¥µ¡¼¥Ð (_S):"
 
-#: src/settingsdlg.c:158
+#: src/settingsdlg.c:602
 #, fuzzy
-msgid "<b>Use _advanced mode</b>"
-msgstr "¾åµé¼Ô¥â¡¼¥É¤ò»È¤¦ (_A):"
+msgid "<b>Auto key _locate</b>"
+msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¸°¥µ¡¼¥Ð (_S):"
 
-#: src/settingsdlg.c:193
-msgid "Settings"
-msgstr "ÀßÄê"
+#: src/settingsdlg.c:612
+msgid ""
+"The list of methods to locate keys via an email address.\n"
+"All given methods are used in turn until a matching key is found.  The "
+"supported methods are:\n"
+" Local\n"
+"   - Use the local keyring.\n"
+" Keyserver\n"
+"   - Use the default keyserver.\n"
+" PKA\n"
+"   - Use the Public Key Association.\n"
+" kDNS\n"
+"   - Use kDNS with the nameserver below.\n"
+" Custom\n"
+"   - Configured in the backend dialog.\n"
+msgstr ""
 
+#: src/settingsdlg.c:627
+msgid "Method:"
+msgstr ""
+
+#: src/settingsdlg.c:644
+msgid "The IP address of the nameserver used for the kDNS method."
+msgstr ""
+
+#: src/settingsdlg.c:646
+#, fuzzy
+msgid "kDNS Server:"
+msgstr "/¥µ¡¼¥Ð (_S)"
+
+#: src/settingsdlg.c:740
+#, fuzzy
+msgid "The URL given for the keyserver is not valid."
+msgstr "»ØÄê¤µ¤ì¤¿¸°¥µ¡¼¥Ð¤ÏÌµ¸ú¤Ç¤¹"
+
+#: src/settingsdlg.c:749
+msgid "The data given for \"Auto key locate\" is not valid."
+msgstr ""
+
+#: src/settingsdlg.c:886
+#, fuzzy
+msgid "GNU Privacy Assistant - Settings"
+msgstr "GNU Privacy Assistant - ¸°Â«¥¨¥Ç¥£¥¿"
+
 #: src/siglist.c:128
 msgid "Level"
 msgstr "¥ì¥Ù¥ë"
 
-#: src/siglist.c:135
-msgid "Local"
-msgstr "¥í¡¼¥«¥ë"
-
 #: src/verifydlg.c:116
 #, fuzzy
 msgid "Verify documents"
@@ -2118,6 +1880,363 @@
 msgid "Signatures:"
 msgstr "½ðÌ¾:"
 
+#~ msgid "/File/C_lear"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/¥¯¥ê¥¢ (_L)"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/³«¤¯ (_O)"
+
+#, fuzzy
+#~ msgid "/File/Save _As"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/ÊÄ¤¸¤ë (_C)"
+
+#~ msgid "/File/sep1"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/sep1"
+
+#~ msgid "/File/_Sign"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/½ðÌ¾¤¹¤ë (_S)"
+
+#~ msgid "/File/_Verify"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/¸¡¾Ú (_V)"
+
+#~ msgid "/File/_Encrypt"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/°Å¹æ²½ (_E)"
+
+#~ msgid "/File/_Decrypt"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/Éü¹æ²½ (_D)"
+
+#~ msgid "/File/sep2"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/sep2"
+
+#~ msgid "/File/_Close"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/ÊÄ¤¸¤ë (_C)"
+
+#~ msgid "/File/_Quit"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/½ªÎ» (_Q)"
+
+#, fuzzy
+#~ msgid "/Edit/_Undo"
+#~ msgstr "/ÊÔ½¸ (E)/¥³¥Ô¡¼ (_C)"
+
+#, fuzzy
+#~ msgid "/Edit/_Redo"
+#~ msgstr "/ÊÔ½¸ (E)/¥³¥Ô¡¼ (_C)"
+
+#, fuzzy
+#~ msgid "/Edit/sep0"
+#~ msgstr "/ÊÔ½¸ (E)/sep2"
+
+#, fuzzy
+#~ msgid "/Edit/Cut"
+#~ msgstr "/ÊÔ½¸ (E)/¥³¥Ô¡¼ (C)"
+
+#~ msgid "/Edit/_Copy"
+#~ msgstr "/ÊÔ½¸ (E)/¥³¥Ô¡¼ (_C)"
+
+#~ msgid "/Edit/_Paste"
+#~ msgstr "/ÊÔ½¸ (E)/Å½¤êÉÕ¤± (_P)"
+
+#, fuzzy
+#~ msgid "/Edit/_Delete"
+#~ msgstr "/ÊÔ½¸ (E)/Å½¤êÉÕ¤± (_P)"
+
+#~ msgid "/Edit/sep1"
+#~ msgstr "/ÊÔ½¸ (E)/sep1"
+
+#~ msgid "/Edit/Select _All"
+#~ msgstr "/ÊÔ½¸ (E)/¤¹¤Ù¤ÆÁªÂò (_A)"
+
+#~ msgid "/Edit/sep2"
+#~ msgstr "/ÊÔ½¸ (E)/sep2"
+
+#~ msgid "/Edit/Pr_eferences..."
+#~ msgstr "/ÊÔ½¸ (E)/ÀßÄê (_E)"
+
+#, fuzzy
+#~ msgid "/Edit/_Backend Preferences..."
+#~ msgstr "/ÊÔ½¸ (E)/ÀßÄê (_E)"
+
+#~ msgid "/_Windows"
+#~ msgstr "/¥¦¥£¥ó¥É¥¦ (_W)"
+
+#~ msgid "/Windows/_Keyring Editor"
+#~ msgstr "/¥¦¥£¥ó¥É¥¦ (W)/¸°Â«¥¨¥Ç¥£¥¿ (_K)"
+
+#~ msgid "/Windows/_Filemanager"
+#~ msgstr "/¥¦¥£¥ó¥É¥¦ (W)/¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã (_F)"
+
+#, fuzzy
+#~ msgid "/Windows/_Clipboard"
+#~ msgstr "/¥¦¥£¥ó¥É¥¦ (W)/¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã (_F)"
+
+#~ msgid "/Edit/Copy"
+#~ msgstr "/ÊÔ½¸ (E)/¥³¥Ô¡¼ (C)"
+
+#, fuzzy
+#~ msgid "/Edit/Delete"
+#~ msgstr "/ÊÔ½¸ (E)/¤¹¤Ù¤ÆÁªÂò (_A)"
+
+#, fuzzy
+#~ msgid "/Edit/Paste"
+#~ msgstr "/ÊÔ½¸ (E)/Å½¤êÉÕ¤± (_P)"
+
+#~ msgid "open file"
+#~ msgstr "¥Õ¥¡¥¤¥ë³«¤¯"
+
+#, fuzzy
+#~ msgid "save file as"
+#~ msgstr "Ì¾Á°¤òÉÕ¤±¤ÆÊÝÂ¸ (_A): "
+
+#, fuzzy
+#~ msgid "cut the selection"
+#~ msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤ò°Å¹æ²½¤¹¤ë"
+
+#, fuzzy
+#~ msgid "copy the selection"
+#~ msgstr "ÁªÂò¥Õ¥¡¥¤¥ë¤ò°Å¹æ²½¤¹¤ë"
+
+#, fuzzy
+#~ msgid "paste the clipboard"
+#~ msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼ (_C)"
+
+#, fuzzy
+#~ msgid "Sign the selected text"
+#~ msgstr "ÁªÂò¤µ¤ì¤¿¸°¤Ë½ðÌ¾¤¹¤ë"
+
+#, fuzzy
+#~ msgid "verify text"
+#~ msgstr "¥Õ¥¡¥¤¥ë¸¡¾Ú"
+
+#~ msgid "Encrypt"
+#~ msgstr "°Å¹æ²½"
+
+#, fuzzy
+#~ msgid "encrypt text"
+#~ msgstr "¥Õ¥¡¥¤¥ë°Å¹æ²½"
+
+#, fuzzy
+#~ msgid "decrypt text"
+#~ msgstr "¥Õ¥¡¥¤¥ëÉü¹æ²½"
+
+#~ msgid "preferences"
+#~ msgstr "ÀßÄê"
+
+#, fuzzy
+#~ msgid "Open the keyring editor"
+#~ msgstr "¸°Â«¥¨¥Ç¥£¥¿¤ò³«¤¯ (¥Ç¥Õ¥©¥ë¥È)"
+
+#, fuzzy
+#~ msgid "keyring editor"
+#~ msgstr "¸°Â«¥¨¥Ç¥£¥¿"
+
+#, fuzzy
+#~ msgid "Open the file manager"
+#~ msgstr "¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤ò³«¤¯"
+
+#~ msgid "file manager"
+#~ msgstr "¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã"
+
+#~ msgid "Help"
+#~ msgstr "¥Ø¥ë¥×"
+
+#~ msgid "help"
+#~ msgstr "¥Ø¥ë¥×"
+
+#~ msgid "/File/Sign"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/½ðÌ¾¤¹¤ë (S)"
+
+#~ msgid "/File/Verify"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/¸¡¾Ú (V)"
+
+#~ msgid "/File/Encrypt"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/°Å¹æ²½ (E)"
+
+#~ msgid "/File/Decrypt"
+#~ msgstr "/¥Õ¥¡¥¤¥ë (F)/Éü¹æ²½ (D)"
+
+#~ msgid "close files"
+#~ msgstr "¥Õ¥¡¥¤¥ëÊÄ¤¸¤ë"
+
+#~ msgid "sign file"
+#~ msgstr "¥Õ¥¡¥¤¥ë¤Ë½ðÌ¾"
+
+#~ msgid "verify file"
+#~ msgstr "¥Õ¥¡¥¤¥ë¸¡¾Ú"
+
+#~ msgid "encrypt file"
+#~ msgstr "¥Õ¥¡¥¤¥ë°Å¹æ²½"
+
+#~ msgid "decrypt file"
+#~ msgstr "¥Õ¥¡¥¤¥ëÉü¹æ²½"
+
+#, fuzzy
+#~ msgid "Open the clipboard"
+#~ msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼ (_C)"
+
+#, fuzzy
+#~ msgid "clipboard"
+#~ msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼ (_C)"
+
+#~ msgid "_Backup to file:"
+#~ msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×Àè¥Õ¥¡¥¤¥ë (_B):"
+
+#~ msgid "B_rowse..."
+#~ msgstr "¥Ö¥é¥¦¥º... (_R)"
+
+#, fuzzy
+#~ msgid "_Back"
+#~ msgstr "/¥Ð¥Ã¥¯¥¢¥Ã¥×... (_B)"
+
+#~ msgid "Brought to you by:"
+#~ msgstr "Äó¶¡¼Ô:"
+
+#, fuzzy
+#~ msgid "GPA is Free Software under the"
+#~ msgstr "GPA is free software under the"
+
+#~ msgid "GNU General Public License."
+#~ msgstr "GNU General Public License."
+
+#~ msgid "For news see:"
+#~ msgstr "ºÇ¿·¾ðÊó¤Ï¤³¤Á¤é:"
+
+#, fuzzy
+#~ msgid "http://www.gpg4win.org"
+#~ msgstr "http://www.gnupg.org"
+
+#~ msgid "http://www.gnupg.org"
+#~ msgstr "http://www.gnupg.org"
+
+#, fuzzy
+#~ msgid "GNU General Public License"
+#~ msgstr "GNU General Public License."
+
+#, fuzzy
+#~ msgid "_GNU General Public License"
+#~ msgstr "GNU General Public License."
+
+#~ msgid "Show Help Text\n"
+#~ msgstr "¥Ø¥ë¥×¤ò¸«¤ë\n"
+
+#~ msgid "/_Help"
+#~ msgstr "/¥Ø¥ë¥× (_H)"
+
+#~ msgid "/Help/_Contents"
+#~ msgstr "/¥Ø¥ë¥× (H)/ÆâÍÆ (_C)"
+
+#~ msgid "/Help/_License"
+#~ msgstr "/¥Ø¥ë¥× (H)/¥é¥¤¥»¥ó¥¹ (_L)"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/¥Ø¥ë¥× (H)/GPA ¤Ë¤Ä¤¤¤Æ (_A)"
+
+#~ msgid "Please insert your name"
+#~ msgstr "»áÌ¾¤òµÆþ¤·¤Æ¤¯¤À¤µ¤¤"
+
+#~ msgid "Please insert your email address"
+#~ msgstr "E ¥á¡¼¥ë¥¢¥É¥ì¥¹¤òµÆþ¤·¤Æ²¼¤µ¤¤"
+
+#, fuzzy
+#~ msgid "/Keys/sep0"
+#~ msgstr "/¸° (K)/sep1"
+
+#~ msgid "/Keys/_Delete Keys..."
+#~ msgstr "/¸° (K)/¸°¤òºï½ü... (_D)"
+
+#~ msgid "/Keys/sep1"
+#~ msgstr "/¸° (K)/sep1"
+
+#~ msgid "/Keys/_Sign Keys..."
+#~ msgstr "/¸° (K)/¸°¤Ë½ðÌ¾... (_S)"
+
+#~ msgid "/Keys/Set _Owner Trust..."
+#~ msgstr "/¸° (K)/½êÍ¼Ô¤Î¿®ÍÑÅÙ¤ò»ØÄê... (_O)"
+
+#~ msgid "/Keys/_Edit Private Key..."
+#~ msgstr "/¸° (K)/ÈëÌ©¸°¤òÊÔ½¸... (_E)"
+
+#~ msgid "/Keys/sep2"
+#~ msgstr "/¸° (K)/sep2"
+
+#~ msgid "/Keys/_Import Keys..."
+#~ msgstr "/¸° (K)/¸°¤ò¥¤¥ó¥Ý¡¼¥È... (_I)"
+
+#~ msgid "/Keys/E_xport Keys..."
+#~ msgstr "/¸° (K)/¸°¤ò¥¨¥¯¥¹¥Ý¡¼¥È... (_X)"
+
+#~ msgid "/Keys/_Backup..."
+#~ msgstr "/¸° (K)/¥Ð¥Ã¥¯¥¢¥Ã¥×... (_B)"
+
+#~ msgid "/Server/_Send Keys..."
+#~ msgstr "/¥µ¡¼¥Ð (S)/¸°¤òÁ÷¿®... (_S)"
+
+#, fuzzy
+#~ msgid "/Windows/_File Manager"
+#~ msgstr "/¥¦¥£¥ó¥É¥¦ (W)/¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã (_F)"
+
+#~ msgid "/Keys/Export Keys..."
+#~ msgstr "/¸° (K)/¸°¤ò¥¨¥¯¥¹¥Ý¡¼¥È... (X)"
+
+#~ msgid "/Keys/Delete Keys..."
+#~ msgstr "/¸° (K)/¸°¤òºï½ü... (D)"
+
+#~ msgid "/Server/Send Keys..."
+#~ msgstr "/¥µ¡¼¥Ð (S)/¸°¤òÁ÷¿®... (S)"
+
+#~ msgid "/Keys/Set Owner Trust..."
+#~ msgstr "/¸° (K)/½êÍ¼Ô¤Î¿®ÍÑÅÙ¤ò»ØÄê... (O)"
+
+#~ msgid "/Keys/Sign Keys..."
+#~ msgstr "/¸° (K)/¸°¤Ë½ðÌ¾... (S)"
+
+#~ msgid "/Keys/Edit Private Key..."
+#~ msgstr "/¸° (K)/ÈëÌ©¸°¤òÊÔ½¸... (E)"
+
+#~ msgid "/Keys/Backup..."
+#~ msgstr "/¸° (K)/¥Ð¥Ã¥¯¥¢¥Ã¥×... (B)"
+
+#~ msgid "/_Copy"
+#~ msgstr "/¥³¥Ô¡¼ (_C)"
+
+#~ msgid "/_Paste"
+#~ msgstr "/Å½¤êÉÕ¤± (_P)"
+
+#~ msgid "/Set Owner Trust..."
+#~ msgstr "/½êÍ¼Ô¤Î¿®ÍÑÅÙ¤ò»ØÄê... (O)"
+
+#~ msgid "/Sign Keys..."
+#~ msgstr "/¸°¤Ë½ðÌ¾... (S)"
+
+#~ msgid "/Edit Private Key..."
+#~ msgstr "/ÈëÌ©¸°¤òÊÔ½¸... (E)"
+
+#~ msgid "/Backup..."
+#~ msgstr "/¥Ð¥Ã¥¯¥¢¥Ã¥×... (B)"
+
+#~ msgid "edit key"
+#~ msgstr "¸°¤òÊÔ½¸"
+
+#~ msgid "remove key"
+#~ msgstr "¸°¤òºï½ü"
+
+#~ msgid "sign key"
+#~ msgstr "¸°¤Ë½ðÌ¾"
+
+#~ msgid "import keys"
+#~ msgstr "¸°¥¤¥ó¥Ý¡¼¥È"
+
+#~ msgid "export keys"
+#~ msgstr "¸°¥¨¥¯¥¹¥Ý¡¼¥È"
+
+#~ msgid "brief"
+#~ msgstr "Í×Ìó"
+
+#~ msgid "detailed"
+#~ msgstr "¾ÜºÙ"
+
+#~ msgid "Settings"
+#~ msgstr "ÀßÄê"
+
 #~ msgid "Sign files"
 #~ msgstr "¥Õ¥¡¥¤¥ë¤Ë½ðÌ¾¤¹¤ë"
 
@@ -2174,9 +2293,6 @@
 #~ msgid "E_xport to file:"
 #~ msgstr "¥¨¥¯¥¹¥Ý¡¼¥ÈÀè¥Õ¥¡¥¤¥ë (_X):"
 
-#~ msgid "_Key server:"
-#~ msgstr "¸°¥µ¡¼¥Ð¡¼ (_K):"
-
 #~ msgid "Import Key"
 #~ msgstr "¸°¤ò¥¤¥ó¥Ý¡¼¥È"
 
@@ -2260,9 +2376,6 @@
 #~ msgid "The currently selected filename."
 #~ msgstr "¸½ºßÁªÂò¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ëÌ¾¡£"
 
-#~ msgid "Show file operations"
-#~ msgstr "¥Õ¥¡¥¤¥ëÆ°ºî¤òÉ½¼¨"
-
 #~ msgid "Whether buttons for creating/manipulating files should be displayed."
 #~ msgstr "¥Õ¥¡¥¤¥ë¤ÎºîÀ®/½èÍý¤Î¤¿¤á¤Î¥Ü¥¿¥ó¤òÉ½¼¨¤¹¤ë¤«¤É¤¦¤«"
 
@@ -2362,9 +2475,6 @@
 #~ msgid "_Delete"
 #~ msgstr "ºï½ü (_D)"
 
-#~ msgid "Delete"
-#~ msgstr "ºï½ü"
-
 #~ msgid ""
 #~ "The file name \"%s\" contains symbols that are not allowed in filenames"
 #~ msgstr "\"%s\" ¤È¤¤¤¦¥Õ¥¡¥¤¥ëÌ¾¤Ë¤Ï¥Õ¥¡¥¤¥ëÌ¾¤Ë»È¤¨¤Ê¤¤µ¹æ¤¬Æþ¤Ã¤Æ¤¤¤Þ¤¹"
@@ -2430,9 +2540,6 @@
 #~ "\"¥Ñ¥¹¥ï¡¼¥É\" ¤È \"ºÆÆþÎÏ\" ¤Ë¤Ï\n"
 #~ "Æ±¤¸¥Ñ¥¹¥ï¡¼¥É¤òÆþÎÏ¤·¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó"
 
-#~ msgid "generate re_vocation certificate"
-#~ msgstr "¼º¸ú¾ÚÌÀ¤ÎÀ¸À® (_V)"
-
 #~ msgid "_send to key server"
 #~ msgstr "¸°¥µ¡¼¥Ð¡¼¤ØÁ÷¿® (_S)"
 
@@ -2578,9 +2685,6 @@
 #~ "Í×µá¤µ¤ì¤¿¸°¤ò¸°¥µ¡¼¥Ð¤«¤é\n"
 #~ "¼õ¿®¤·¤Æ¤¤¤ë´Ö¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£"
 
-#~ msgid "Receive key from server"
-#~ msgstr "¸°¤ò¥µ¡¼¥Ð¤«¤é¼õ¿®"
-
 #~ msgid "_Key ID: "
 #~ msgstr "¸° ID (_K): "
 
@@ -2815,9 +2919,6 @@
 #~ msgid "Save encrypted file as"
 #~ msgstr "°Å¹æ²½¥Õ¥¡¥¤¥ë¤ÎÊÝÂ¸Àè"
 
-#~ msgid "_Encrypt"
-#~ msgstr "°Å¹æ²½ (_E)"
-
 #~ msgid "Protect files by Password"
 #~ msgstr "¥Ñ¥¹¥ï¡¼¥É¤Ç¥Õ¥¡¥¤¥ë¤òÊÝ¸î"
 

Modified: trunk/po/nl.po
===================================================================
--- trunk/po/nl.po	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/nl.po	2008-05-08 12:53:41 UTC (rev 891)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.5.1\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-03-12 12:29+0100\n"
+"POT-Creation-Date: 2008-05-08 14:51+0200\n"
 "PO-Revision-Date: 2003-10-19 14:29+0200\n"
 "Last-Translator: Michael Anckaert <michael.anckaert at pi.be>\n"
 "Language-Team: DUTCH <nl at li.org>\n"
@@ -12,431 +12,217 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/clipboard.c:367 src/fileman.c:350
+#: src/clipboard.c:376 src/fileman.c:392
 msgid "Open File"
 msgstr "Open bestand"
 
-#: src/clipboard.c:395 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "GPA Bericht"
 
 #. TRANSLATORS: The arguments are the filename, the integer size
 #. and the unit (such as KB or MB).
-#: src/clipboard.c:412
+#: src/clipboard.c:421
 #, fuzzy, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
 msgstr ""
 "Het bestand %s bestaat al.\n"
 "Wilt u het bestand overschrijven?"
 
-#: src/clipboard.c:481
+#: src/clipboard.c:542
 msgid "Save As..."
 msgstr ""
 
-#: src/clipboard.c:522 src/clipboard.c:552 src/clipboard.c:582
-#: src/clipboard.c:612 src/clipboard.c:1113 src/fileman.c:675
-#: src/keyring.c:1657
+#: src/clipboard.c:583 src/clipboard.c:613 src/clipboard.c:643
+#: src/clipboard.c:673 src/clipboard.c:1034
 #, fuzzy
 msgid "Clipboard"
 msgstr "Naar _klembord"
 
-#: src/clipboard.c:692 src/fileman.c:472 src/keyring.c:863
-msgid "/_File"
+#: src/clipboard.c:755 src/fileman.c:515 src/keyring.c:884
+#, fuzzy
+msgid "_File"
 msgstr "/_Bestand"
 
-#: src/clipboard.c:693 src/fileman.c:474
-msgid "/File/C_lear"
-msgstr "/Bestand/_Leeg maken"
-
-#: src/clipboard.c:694 src/fileman.c:473
-msgid "/File/_Open"
-msgstr "/Bestand/_Openen"
-
-#: src/clipboard.c:695
+#: src/clipboard.c:756 src/fileman.c:516 src/keyring.c:885
 #, fuzzy
-msgid "/File/Save _As"
-msgstr "/Bestand/_Sluiten"
-
-#: src/clipboard.c:697 src/fileman.c:475
-msgid "/File/sep1"
-msgstr "/Bestand/sep1"
-
-#: src/clipboard.c:698 src/fileman.c:476
-msgid "/File/_Sign"
-msgstr "/Bestand/_Ondertekenen"
-
-#: src/clipboard.c:699 src/fileman.c:477
-msgid "/File/_Verify"
-msgstr "/Bestand/_Ontsleutelen"
-
-#: src/clipboard.c:700 src/fileman.c:478
-msgid "/File/_Encrypt"
-msgstr "/Bestand/_Versleutelen"
-
-#: src/clipboard.c:701 src/fileman.c:479
-msgid "/File/_Decrypt"
-msgstr "/Bestand/_Ontsleutelen"
-
-#: src/clipboard.c:702 src/fileman.c:480
-msgid "/File/sep2"
-msgstr "/Bestand/sep2"
-
-#: src/clipboard.c:703 src/fileman.c:481 src/keyring.c:864
-msgid "/File/_Close"
-msgstr "/Bestand/_Sluiten"
-
-#: src/clipboard.c:704 src/fileman.c:482 src/keyring.c:866
-msgid "/File/_Quit"
-msgstr "/Bestand/_Stoppen"
-
-#: src/clipboard.c:707 src/fileman.c:485 src/keyring.c:869
-msgid "/_Edit"
+msgid "_Edit"
 msgstr "Bewerk"
 
-#: src/clipboard.c:710
-#, fuzzy
-msgid "/Edit/_Undo"
-msgstr "/Bewerk/_Kopieer"
+#: src/clipboard.c:760
+msgid "Clear buffer"
+msgstr ""
 
-#: src/clipboard.c:711
-#, fuzzy
-msgid "/Edit/_Redo"
-msgstr "/Bewerk/_Kopieer"
+#: src/clipboard.c:762 src/fileman.c:520
+msgid "Open a file"
+msgstr "Bestand openen"
 
-#: src/clipboard.c:712
+#: src/clipboard.c:764
 #, fuzzy
-msgid "/Edit/sep0"
-msgstr "/Bestand/sep2"
+msgid "Save to a file"
+msgstr "Bestand openen"
 
-#: src/clipboard.c:714 src/clipboard.c:750
+#: src/clipboard.c:766
 #, fuzzy
-msgid "/Edit/Cut"
-msgstr "/Bewerk/Kopieer"
+msgid "Sign buffer text"
+msgstr "onderteken sleutel"
 
-#: src/clipboard.c:715 src/keyring.c:870
-msgid "/Edit/_Copy"
-msgstr "/Bewerk/_Kopieer"
-
-#: src/clipboard.c:716 src/keyring.c:872
-msgid "/Edit/_Paste"
-msgstr "/Bewerk/_Plak"
-
-#: src/clipboard.c:717
+#: src/clipboard.c:768
 #, fuzzy
-msgid "/Edit/_Delete"
-msgstr "/Bewerk/_Plak"
+msgid "Check signatures of buffer text"
+msgstr "Controleer ondertekeningen van het geselecteerde bestand"
 
-#: src/clipboard.c:718 src/keyring.c:874
-msgid "/Edit/sep1"
-msgstr "/Bestand/sep1"
-
-#: src/clipboard.c:719 src/fileman.c:486 src/keyring.c:875
-msgid "/Edit/Select _All"
-msgstr "/Bewerk/Selecteer _Alles"
-
-#: src/clipboard.c:721 src/fileman.c:487 src/keyring.c:876
-msgid "/Edit/sep2"
-msgstr "/Bestand/sep2"
-
-#: src/clipboard.c:722 src/fileman.c:488 src/keyring.c:877
-msgid "/Edit/Pr_eferences..."
-msgstr "/Bewerk/Voork_euren..."
-
-#: src/clipboard.c:724 src/fileman.c:490 src/keyring.c:879
+#: src/clipboard.c:770
 #, fuzzy
-msgid "/Edit/_Backend Preferences..."
-msgstr "/Bewerk/Voork_euren..."
+msgid "Encrypt the buffer text"
+msgstr "Versleutel het geselecteerde bestand"
 
-#: src/clipboard.c:728 src/fileman.c:494 src/keyring.c:906
-msgid "/_Windows"
-msgstr "/_Vensters"
-
-#: src/clipboard.c:729 src/fileman.c:495 src/keyring.c:907
-msgid "/Windows/_Keyring Editor"
-msgstr "/Vensters/_Keyring Editor"
-
-#: src/clipboard.c:730 src/fileman.c:496
-msgid "/Windows/_Filemanager"
-msgstr "/Vensters/_Bestandsbeheerder"
-
-#: src/clipboard.c:731 src/fileman.c:497 src/keyring.c:909
+#: src/clipboard.c:772
 #, fuzzy
-msgid "/Windows/_Clipboard"
-msgstr "/Vensters/_Bestandsbeheerder"
+msgid "Decrypt the buffer text"
+msgstr "Ontsleutel het geselecteerde bestand"
 
-#: src/clipboard.c:758 src/keyring.c:948
-msgid "/Edit/Copy"
-msgstr "/Bewerk/Kopieer"
-
-#: src/clipboard.c:766
-#, fuzzy
-msgid "/Edit/Delete"
-msgstr "/Bewerk/Selecteer _Alles"
-
 #: src/clipboard.c:774
-#, fuzzy
-msgid "/Edit/Paste"
-msgstr "/Bewerk/_Plak"
-
-#: src/clipboard.c:879
-msgid "Clear buffer"
+msgid "Close the buffer"
 msgstr ""
 
-#: src/clipboard.c:879
-msgid "clear buffer"
+#: src/clipboard.c:776 src/fileman.c:534 src/keyring.c:893
+msgid "Quit the program"
 msgstr ""
 
-#: src/clipboard.c:887 src/fileman.c:602
-msgid "Open a file"
-msgstr "Bestand openen"
-
-#: src/clipboard.c:887 src/fileman.c:602
-msgid "open file"
-msgstr "open bestand"
-
-#: src/clipboard.c:892
+#: src/clipboard.c:782
 #, fuzzy
-msgid "Save to a file"
-msgstr "Bestand openen"
+msgid "Undo the last action"
+msgstr "Versleutel het geselecteerde bestand"
 
-#: src/clipboard.c:892
-#, fuzzy
-msgid "save file as"
-msgstr "sluit bestand"
+#: src/clipboard.c:784
+msgid "Redo the last undone action"
+msgstr ""
 
-#: src/clipboard.c:900
+#: src/clipboard.c:787
 #, fuzzy
 msgid "Cut the selection"
 msgstr "Versleutel het geselecteerde bestand"
 
-#: src/clipboard.c:901
+#: src/clipboard.c:789 src/keyring.c:897
 #, fuzzy
-msgid "cut the selection"
-msgstr "Versleutel het geselecteerde bestand"
-
-#: src/clipboard.c:907
-#, fuzzy
 msgid "Copy the selection"
 msgstr "Versleutel het geselecteerde bestand"
 
-#: src/clipboard.c:908
+#: src/clipboard.c:791 src/keyring.c:899
 #, fuzzy
-msgid "copy the selection"
-msgstr "Versleutel het geselecteerde bestand"
-
-#: src/clipboard.c:914
-#, fuzzy
 msgid "Paste the clipboard"
 msgstr "Naar _klembord"
 
-#: src/clipboard.c:915
+#: src/clipboard.c:793
 #, fuzzy
-msgid "paste the clipboard"
-msgstr "Naar _klembord"
-
-#: src/clipboard.c:925 src/fileman.c:612 src/keyring.c:1570
-msgid "Sign"
-msgstr "Ondertekenen"
-
-#: src/clipboard.c:926
-#, fuzzy
-msgid "Sign the selected text"
-msgstr "Onderteken de geselecteerde sleutel"
-
-#: src/clipboard.c:927
-#, fuzzy
-msgid "sign text"
-msgstr "onderteken sleutel"
-
-#: src/clipboard.c:935 src/fileman.c:623
-msgid "Verify"
-msgstr "Verifieer"
-
-#: src/clipboard.c:936
-#, fuzzy
-msgid "Check signatures of selected text"
-msgstr "Controleer ondertekeningen van het geselecteerde bestand"
-
-#: src/clipboard.c:937
-#, fuzzy
-msgid "verify text"
-msgstr "verifieer bestand"
-
-#: src/clipboard.c:945 src/fileman.c:634
-msgid "Encrypt"
-msgstr "Versleutel"
-
-#: src/clipboard.c:946
-#, fuzzy
-msgid "Encrypt the selected text"
-msgstr "Versleutel het geselecteerde bestand"
-
-#: src/clipboard.c:947
-#, fuzzy
-msgid "encrypt text"
-msgstr "versleutel bestand"
-
-#: src/clipboard.c:955 src/fileman.c:645
-msgid "Decrypt"
-msgstr " Ontsleutel "
-
-#: src/clipboard.c:956
-#, fuzzy
-msgid "Decrypt the selected text"
+msgid "Delete the selected text"
 msgstr "Ontsleutel het geselecteerde bestand"
 
-#: src/clipboard.c:957
-#, fuzzy
-msgid "decrypt text"
-msgstr "ontsleutel bestand"
+#: src/clipboard.c:795
+msgid "Select the entire document"
+msgstr ""
 
-#: src/clipboard.c:967 src/fileman.c:658 src/keyring.c:1631
+#: src/clipboard.c:902 src/fileman.c:625
 #, fuzzy
-msgid "Open the preferences dialog"
-msgstr "Open de voorkeuren dialoog"
-
-#: src/clipboard.c:968 src/fileman.c:659 src/keyring.c:1632
-msgid "preferences"
-msgstr "voorkeuren"
-
-#: src/clipboard.c:975 src/fileman.c:666
-#, fuzzy
 msgid "Keyring"
 msgstr "Keyring Editor"
 
-#: src/clipboard.c:976 src/fileman.c:667
-#, fuzzy
-msgid "Open the keyring editor"
-msgstr "open keyring editor (standaard)"
-
-#: src/clipboard.c:977 src/fileman.c:668
-#, fuzzy
-msgid "keyring editor"
-msgstr "Keyring Editor"
-
-#: src/clipboard.c:983 src/keyring.c:1648
+#: src/clipboard.c:904 src/keyring.c:1073
 msgid "Files"
 msgstr "Bestanden"
 
-#: src/clipboard.c:984 src/keyring.c:1649
+#: src/clipboard.c:1004
 #, fuzzy
-msgid "Open the file manager"
-msgstr "Open de bestandsbeheerder"
-
-#: src/clipboard.c:985 src/keyring.c:1650
-msgid "file manager"
-msgstr "bestandsbeheerder"
-
-#: src/clipboard.c:992 src/fileman.c:684 src/keyring.c:1665
-msgid "Help"
-msgstr "Help"
-
-#: src/clipboard.c:993 src/fileman.c:685 src/keyring.c:1666
-msgid "Understanding the GNU Privacy Assistant"
-msgstr "De GNU Privacy Assistent verstaan"
-
-#: src/clipboard.c:994 src/fileman.c:686 src/keyring.c:1667
-msgid "help"
-msgstr "help"
-
-#: src/clipboard.c:1084
-#, fuzzy
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Privacy Assistant - Bestands beheerder"
 
-#: src/confdialog.c:993
+#: src/confdialog.c:994
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 #, fuzzy
 msgid "Use default values"
 msgstr "Stel standaard sleutel in"
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 #, fuzzy
 msgid "Use default value"
 msgstr "Stel standaard sleutel in"
 
-#: src/confdialog.c:1146
+#: src/confdialog.c:1147
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1155
+#: src/confdialog.c:1156
 #, fuzzy
 msgid "Use default argument"
 msgstr "Stel standaard sleutel in"
 
-#: src/confdialog.c:1280
+#: src/confdialog.c:1281
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1325
+#: src/confdialog.c:1326
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1334
+#: src/confdialog.c:1332
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1346
+#: src/confdialog.c:1351
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1350
+#: src/confdialog.c:1355
 #, fuzzy
 msgid "Level:"
 msgstr "Niveau"
 
-#: src/confdialog.c:1359
+#: src/confdialog.c:1364
 #, fuzzy
 msgid "Basic"
 msgstr "/_Backup...."
 
-#: src/confdialog.c:1360
+#: src/confdialog.c:1365
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1361
+#: src/confdialog.c:1366
 #, fuzzy
 msgid "Expert"
 msgstr "Exporteer"
 
-#: src/encryptdlg.c:142 src/expirydlg.c:116 src/filesigndlg.c:133
-#: src/gpabackupop.c:292 src/gpaprogressdlg.c:146 src/gparecvkeydlg.c:96
-#: src/gpawizard.c:289 src/gpgmetools.c:696 src/keygendlg.c:149
-#: src/ownertrustdlg.c:111 src/passwddlg.c:100
-msgid "_Cancel"
-msgstr "_Annuleer"
-
-#: src/encryptdlg.c:143
+#: src/encryptdlg.c:139
 #, fuzzy
 msgid "Encrypt documents"
 msgstr "Versleutel bestanden"
 
-#: src/encryptdlg.c:174
+#: src/encryptdlg.c:156
 msgid "_Public Keys"
 msgstr "_Publieke sleutels"
 
-#: src/encryptdlg.c:177
+#: src/encryptdlg.c:179 src/icons.c:198
 msgid "_Sign"
 msgstr "_Ondertekenen"
 
-#: src/encryptdlg.c:201 src/filesigndlg.c:185
+#: src/encryptdlg.c:185
 msgid "Sign _as "
 msgstr "Ondertekenen_als"
 
-#: src/encryptdlg.c:215 src/filesigndlg.c:187
+#: src/encryptdlg.c:215 src/filesigndlg.c:227
 msgid "A_rmor"
 msgstr "ASCII-_Armor"
 
@@ -444,148 +230,100 @@
 msgid "Please provide a correct date."
 msgstr "Voorzie aub een correcte datum."
 
-#: src/expirydlg.c:111
+#: src/expirydlg.c:108
 msgid "Change expiry date"
 msgstr "Verander verval datum"
 
-#: src/expirydlg.c:129
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+msgid "_Cancel"
+msgstr "_Annuleer"
+
+#: src/expirydlg.c:124
 msgid "_never expire"
 msgstr "vervalt _nooit"
 
-#: src/expirydlg.c:134
+#: src/expirydlg.c:129
 msgid "_expire on:"
 msgstr "v_ervalt op"
 
-#: src/fileman.c:355 src/fileman.c:953
-msgid "The file is already open."
-msgstr "Het bestand is reeds geopend."
-
-#: src/fileman.c:516
-msgid "/File/Sign"
-msgstr "/Bestand/_Ondertekenen"
-
-#: src/fileman.c:521
-msgid "/File/Verify"
-msgstr "/Bestand/verifieren"
-
-#: src/fileman.c:526
-msgid "/File/Encrypt"
-msgstr "/Bestand/_Versleutelen"
-
-#: src/fileman.c:531
-msgid "/File/Decrypt"
-msgstr "/Bestand/_Ontsleutelen"
-
-#: src/fileman.c:606
+#: src/fileman.c:522
 msgid "Close all files"
 msgstr "Alle bestanden sluiten"
 
-#: src/fileman.c:606
-msgid "close files"
-msgstr "sluit bestand"
-
-#: src/fileman.c:613
+#: src/fileman.c:524
 msgid "Sign the selected file"
 msgstr "Onderteken het geselecteerde bestand"
 
-#: src/fileman.c:614
-msgid "sign file"
-msgstr "onderteken bestand"
-
-#: src/fileman.c:624
+#: src/fileman.c:526
 msgid "Check signatures of selected file"
 msgstr "Controleer ondertekeningen van het geselecteerde bestand"
 
-#: src/fileman.c:625
-msgid "verify file"
-msgstr "verifieer bestand"
-
-#: src/fileman.c:635
+#: src/fileman.c:528
 msgid "Encrypt the selected file"
 msgstr "Versleutel het geselecteerde bestand"
 
-#: src/fileman.c:636
-msgid "encrypt file"
-msgstr "versleutel bestand"
-
-#: src/fileman.c:646
+#: src/fileman.c:530
 msgid "Decrypt the selected file"
 msgstr "Ontsleutel het geselecteerde bestand"
 
-#: src/fileman.c:647
-msgid "decrypt file"
-msgstr "ontsleutel bestand"
+#: src/fileman.c:532
+msgid "Close the window"
+msgstr ""
 
-#: src/fileman.c:676 src/keyring.c:1658
+#: src/fileman.c:538
 #, fuzzy
-msgid "Open the clipboard"
-msgstr "Naar _klembord"
+msgid "Select all files"
+msgstr "Alle bestanden sluiten"
 
-#: src/fileman.c:677 src/keyring.c:1659
-#, fuzzy
-msgid "clipboard"
-msgstr "Naar _klembord"
-
-#: src/fileman.c:785
+#: src/fileman.c:731
 msgid "File"
 msgstr "Bestand"
 
-#: src/fileman.c:850
+#: src/fileman.c:796
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Bestands beheerder"
 
-#: src/fileman.c:876
+#: src/fileman.c:819
 #, fuzzy
 msgid "File Manager"
 msgstr "bestandsbeheerder"
 
-#: src/filesigndlg.c:134
+#: src/fileman.c:895
+msgid "The file is already open."
+msgstr "Het bestand is reeds geopend."
+
+#: src/filesigndlg.c:171
 msgid "Sign documents"
 msgstr ""
 
-#: src/filesigndlg.c:144
-msgid "Signing Mode"
+#: src/filesigndlg.c:180
+#, fuzzy
+msgid "<b>Sign _as</b>"
+msgstr "Ondertekenen_als"
+
+#: src/filesigndlg.c:201
+#, fuzzy
+msgid "<b>Signing Mode</b>"
 msgstr "Onderteken modus"
 
-#: src/filesigndlg.c:152
-msgid "si_gn and compress"
+#: src/filesigndlg.c:211
+#, fuzzy
+msgid "Si_gn and compress"
 msgstr "onder_teken en comprimeer"
 
-#: src/filesigndlg.c:158
-msgid "_cleartext signature"
+#: src/filesigndlg.c:217
+#, fuzzy
+msgid "Clear_text signature"
 msgstr "_platte text ondertekening"
 
-#: src/filesigndlg.c:165
+#: src/filesigndlg.c:223
 #, fuzzy
-msgid "_detached signature"
+msgid "_Detached signature"
 msgstr "_platte text ondertekening"
 
-#: src/gpabackupop.c:213 src/gpgmetools.c:138
+#: src/gpabackupop.c:208
 #, c-format
 msgid ""
-"The file %s already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Het bestand %s bestaat al.\n"
-"Wilt u het bestand overschrijven?"
-
-#: src/gpabackupop.c:216 src/gpaexportserverop.c:134
-#: src/gpafileencryptop.c:455 src/gpafileverifyop.c:178 src/gpgmetools.c:141
-#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:62
-#: src/settingsdlg.c:165
-msgid "_Yes"
-msgstr "_Ja"
-
-#: src/gpabackupop.c:217 src/gpaexportserverop.c:135
-#: src/gpafileencryptop.c:456 src/gpafileverifyop.c:179 src/gpgmetools.c:142
-#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:64
-#: src/settingsdlg.c:168
-msgid "_No"
-msgstr "_Nee"
-
-#: src/gpabackupop.c:229
-#, c-format
-msgid ""
 "A copy of your secret key has been made to the file:\n"
 "\n"
 "\t\"%s\"\n"
@@ -600,31 +338,19 @@
 "Dit is gevoelige informatie en moet met zorg bewaard worden\n"
 "(bewaar deze kopie bijvoorbeeld op een floppy en in een veilige plaats)."
 
-#: src/gpabackupop.c:244
+#: src/gpabackupop.c:223
 msgid "An error ocurred during the backup operation."
 msgstr ""
 
-#: src/gpabackupop.c:260
+#: src/gpabackupop.c:245
 msgid "Backup key to file"
 msgstr "_Backup sleutel naar bestand:"
 
-#: src/gpabackupop.c:287
-msgid "Backup Keys"
-msgstr "Sleutels Backuppen"
-
-#: src/gpabackupop.c:311
+#: src/gpabackupop.c:255
 #, c-format
 msgid "Generating backup of key: %s"
 msgstr "Genereren van backup van sleutel: %s"
 
-#: src/gpabackupop.c:317
-msgid "_Backup to file:"
-msgstr "_Backup naar bestand:"
-
-#: src/gpabackupop.c:329
-msgid "B_rowse..."
-msgstr "_Bladeren..."
-
 #: src/gpa.c:92
 #, fuzzy
 msgid "Output version information and exit"
@@ -646,26 +372,31 @@
 msgstr "Naar _klembord"
 
 #: src/gpa.c:100
-msgid "Start only the UI server (implies --cms)"
+#, fuzzy
+msgid "Open the settings dialog"
+msgstr "Open de voorkeuren dialoog"
+
+#: src/gpa.c:102
+msgid "Enable the UI server (implies --cms)"
 msgstr ""
 
-#: src/gpa.c:102
+#: src/gpa.c:104
 #, fuzzy
 msgid "Read options from file"
 msgstr "lees opties van bestand"
 
-#: src/gpa.c:293
+#: src/gpa.c:286
 msgid "[FILE...]"
 msgstr ""
 
-#: src/gpa.c:295
+#: src/gpa.c:288
 #, fuzzy
 msgid "Graphical frontend to GnuPG"
 msgstr ""
 "Syntax: gpa [opties]\n"
 "Grafische frontend voor GnuPG\n"
 
-#: src/gpa.c:296
+#: src/gpa.c:289
 msgid "Please report bugs to <"
 msgstr "Rapporteer fouten aub naar <"
 
@@ -673,15 +404,15 @@
 msgid "The keys have been copied to the clipboard."
 msgstr "De sleutels werden naar het klembord gekopieerd."
 
-#: src/gpaexportfileop.c:133
+#: src/gpaexportfileop.c:139
 msgid "Export public keys to file"
 msgstr "Exporteer publieke sleutel naar bestand"
 
-#: src/gpaexportfileop.c:137
+#: src/gpaexportfileop.c:150
 msgid "_armor"
 msgstr "ASCII-_Armor"
 
-#: src/gpaexportfileop.c:171
+#: src/gpaexportfileop.c:182
 #, c-format
 msgid "The keys have been exported to %s."
 msgstr "De sleutels werden naar %s geëxporteerd."
@@ -697,6 +428,18 @@
 "keyserver gestuurd worden (\"%s\").\n"
 "Bent u zeker dat u deze sleutel wilt verspreiden?"
 
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:459
+#: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
+#: src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Ja"
+
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:460
+#: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
+#: src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_Nee"
+
 #: src/gpaexportserverop.c:187
 msgid "The keys have been sent to the server."
 msgstr "De sleutels werden naar de server gestuurd."
@@ -705,29 +448,29 @@
 msgid "Decrypting..."
 msgstr "Aan het ontsleutelen..."
 
-#: src/gpafiledecryptop.c:358 src/gpafileverifyop.c:449
+#: src/gpafiledecryptop.c:367 src/gpafileverifyop.c:464
 #, fuzzy, c-format
 msgid "\"%s\" contained no OpenPGP data."
 msgstr "Het bestand \"%s\" bevat geen OpenPGP data."
 
-#: src/gpafiledecryptop.c:359 src/gpafileverifyop.c:450
+#: src/gpafiledecryptop.c:368 src/gpafileverifyop.c:465
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no OpenPGPdata."
 msgstr "Het bestand \"%s\" bevat geen OpenPGP data."
 
-#: src/gpafiledecryptop.c:369
+#: src/gpafiledecryptop.c:378
 #, fuzzy, c-format
 msgid "\"%s\" contained no valid encrypted data."
 msgstr "Het bestand \"%s\" bevat geen geldige versleutelde data."
 
-#: src/gpafiledecryptop.c:371
+#: src/gpafiledecryptop.c:380
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no validencrypted data."
 msgstr "Het bestand \"%s\" bevat geen geldige versleutelde data."
 
-#: src/gpafiledecryptop.c:380 src/gpafileencryptop.c:727
-#: src/gpafilesignop.c:510 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
-#: src/gpakeypasswdop.c:197 src/gpakeysignop.c:229
+#: src/gpafiledecryptop.c:389 src/gpafileencryptop.c:751
+#: src/gpafilesignop.c:525 src/gpafileverifyop.c:475 src/gpakeyexpireop.c:240
+#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:237
 msgid "Wrong passphrase!"
 msgstr "Verkeerd wachtwoord!"
 
@@ -735,61 +478,60 @@
 msgid "Encrypting..."
 msgstr "Aan het versleutelen..."
 
-#: src/gpafileencryptop.c:453 src/verifydlg.c:222
+#: src/gpafileencryptop.c:457 src/verifydlg.c:222
 msgid "Unknown Key"
 msgstr "Onbekende Sleutel"
 
-#: src/gpafileencryptop.c:469
+#: src/gpafileencryptop.c:473
 #, fuzzy
 msgid "You are going to encrypt a document using the following key:"
 msgstr "U gaat een bestand versleutelen met de volgende sleutel:"
 
-#: src/gpafileencryptop.c:475
+#: src/gpafileencryptop.c:479
 msgid "However, it is not certain that the key belongs to that person."
 msgstr "Hoewel, het is niet zeker dat de sleutel aan die persoon toebehoort."
 
-#: src/gpafileencryptop.c:481
+#: src/gpafileencryptop.c:485
 msgid "Do you <b>really</b> want to use this key?"
 msgstr "Wil je <b>echt</b> deze sleutel gebruiken?"
 
-#: src/gpafileencryptop.c:502 src/gpafileencryptop.c:542 src/verifydlg.c:227
+#: src/gpafileencryptop.c:506 src/gpafileencryptop.c:546 src/verifydlg.c:227
 msgid "Revoked Key"
 msgstr "Teruggetrokken sleutel"
 
-#: src/gpafileencryptop.c:504 src/gpafileencryptop.c:544 src/gpawizard.c:281
-#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:422
-#: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
+#: src/gpafileencryptop.c:508 src/gpafileencryptop.c:548 src/gtktools.c:52
+#: src/gtktools.c:86 src/keyeditdlg.c:149 src/verifydlg.c:115
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: src/gpafileencryptop.c:517
+#: src/gpafileencryptop.c:521
 msgid "The following key has been revoked by it's owner:"
 msgstr "De volgende sleutel is gerevoceerd door de eigenaar:"
 
-#: src/gpafileencryptop.c:522 src/gpafileencryptop.c:565
+#: src/gpafileencryptop.c:526 src/gpafileencryptop.c:569
 msgid "And can not be used for encryption."
 msgstr "En kan niet gebruikt worden voor versleuteling."
 
-#: src/gpafileencryptop.c:557
+#: src/gpafileencryptop.c:561
 #, c-format
 msgid "The following key expired on %s:"
 msgstr "De volgende sleutel vervalt op %s:"
 
-#: src/gpafileencryptop.c:641 src/gpafilesignop.c:414
+#: src/gpafileencryptop.c:600 src/gpafilesignop.c:448
+msgid ""
+"The selected certificates are not all of the same type. That is, you mixed "
+"OpenPGP and X.509 certificates. Please make sure to select only certificates "
+"of the same type."
+msgstr ""
+
+#: src/gpafileencryptop.c:675 src/gpafilesignop.c:434
 msgid "You didn't select any key for signing"
 msgstr "U hebt geen sleutel geselecteerd voor ondertekening"
 
-#: src/gpafilesignop.c:148
+#: src/gpafilesignop.c:157
 msgid "Signing..."
 msgstr "Aan het ondertekenen..."
 
-#: src/gpafilesignop.c:428
-msgid ""
-"The selected certificates are not all of the same type. That is, you mixed "
-"OpenPGP and X.509 certificates. Please make sure to select only certificates "
-"of the same type."
-msgstr ""
-
 #: src/gpafileverifyop.c:101
 msgid "Verifying..."
 msgstr "Aan het verifieren..."
@@ -807,15 +549,15 @@
 msgid "Generating Key..."
 msgstr "Genereren van de sleutel..."
 
-#: src/gpaimportfileop.c:131
+#: src/gpaimportfileop.c:132
 msgid "Import public keys from file"
 msgstr "Importeer publieke sleutels vanuit een bestand"
 
-#: src/gpaimportop.c:197
+#: src/gpaimportop.c:196
 msgid "No keys were found."
 msgstr "Geen sleutels gevonden."
 
-#: src/gpaimportop.c:205
+#: src/gpaimportop.c:204
 #, c-format
 msgid ""
 "%i public keys read\n"
@@ -832,35 +574,35 @@
 "%i geheime sleutels geïmporteerd\n"
 "%i geheime sleutels onveranderd"
 
-#: src/gpakeyexpireop.c:239
+#: src/gpakeyexpireop.c:244
 msgid ""
 "Invalid time given.\n"
 "(you may not set the expiration time to the past.)"
 msgstr ""
 
-#: src/gpakeyselector.c:86 src/keylist.c:567 src/siglist.c:94
+#: src/gpakeyselector.c:86 src/keylist.c:555 src/siglist.c:94
 #: src/siglist.c:114 src/verifydlg.c:324
 msgid "Key ID"
 msgstr "Sleutel ID:"
 
-#: src/gpakeyselector.c:95 src/keylist.c:618 src/siglist.c:100
+#: src/gpakeyselector.c:95 src/keylist.c:606 src/siglist.c:100
 #: src/siglist.c:143 src/verifydlg.c:336
 msgid "User Name"
 msgstr "Gebruiker naam"
 
-#: src/gpakeysignop.c:188
+#: src/gpakeysignop.c:191
 msgid "No private key for signing."
 msgstr "Geen geheime sleutel voor ondertekening."
 
-#: src/gpakeysignop.c:233
+#: src/gpakeysignop.c:241
 msgid "This key has expired! Unable to sign."
 msgstr "Deze sleutel is vervallen! Kan niet ondertekenen."
 
-#: src/gpakeysignop.c:237
+#: src/gpakeysignop.c:245
 msgid "This key has already been signed with your own!"
 msgstr "Deze sleutel is al ondertekend met uw eigen sleutel!"
 
-#: src/gpakeysignop.c:242
+#: src/gpakeysignop.c:250
 msgid "You haven't selected a default key to sign with!"
 msgstr "U hebt geen sleutel geselecteerd voor ondertekening"
 
@@ -888,7 +630,7 @@
 msgid "unknown"
 msgstr "onbekend"
 
-#: src/gparecvkeydlg.c:101
+#: src/gparecvkeydlg.c:106
 msgid "Which key do you want to import? (The key must be specified by key ID)."
 msgstr ""
 "Welke sleutel wilt u importeren? (De sleutel moet aangeduid zijn\n"
@@ -914,7 +656,7 @@
 msgid "Size"
 msgstr "Grootte"
 
-#: src/gpasubkeylist.c:97 src/keyeditdlg.c:171 src/keylist.c:580
+#: src/gpasubkeylist.c:97 src/keyeditdlg.c:168 src/keylist.c:568
 msgid "Expiry Date"
 msgstr "Verval datum"
 
@@ -934,16 +676,16 @@
 msgid "Can authenticate"
 msgstr "Kan geauthenticeerd worden"
 
-#: src/gpasubkeylist.c:137 src/gpgmetools.c:613 src/gpgmetools.c:821
-#: src/gpgmetools.c:940
+#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:833
+#: src/gpgmetools.c:952
 msgid "Revoked"
 msgstr "Terugtrekken"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:615 src/gpgmetools.c:936
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:948
 msgid "Expired"
 msgstr "Vervallen"
 
-#: src/gpasubkeylist.c:145 src/gpgmetools.c:617
+#: src/gpasubkeylist.c:145 src/gpgmetools.c:626
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
@@ -951,41 +693,41 @@
 msgid "Unsigned"
 msgstr "Niet ondertekend"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:927 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:939 src/verifydlg.c:212
 msgid "Valid"
 msgstr "Geldig"
 
-#: src/gpawidgets.c:72 src/gpgmetools.c:661 src/gpgmetools.c:668
-#: src/keyring.c:1176 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
+#: src/keyring.c:1248 src/keysigndlg.c:100
 msgid "User Name:"
 msgstr "Gebruiker naam:"
 
-#: src/gpawidgets.c:72 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/keysigndlg.c:100
 msgid "User Names:"
 msgstr "Gebruikers Namen:"
 
-#: src/gpawidgets.c:78 src/gpgmetools.c:662 src/gpgmetools.c:669
-#: src/keyring.c:1178
+#: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
+#: src/keyring.c:1250
 msgid "Key ID:"
 msgstr "Sleutel ID:"
 
-#: src/gpawidgets.c:194
+#: src/gpawidgets.c:180
 msgid "Expiration"
 msgstr "Vervaldag"
 
-#: src/gpawidgets.c:201
+#: src/gpawidgets.c:187
 msgid "_indefinitely valid"
 msgstr "_oneindig geldig"
 
-#: src/gpawidgets.c:210
+#: src/gpawidgets.c:195
 msgid "expire _after"
 msgstr "vervalt _na"
 
-#: src/gpawidgets.c:229
+#: src/gpawidgets.c:215
 msgid "expire o_n:"
 msgstr "v_ervalt op"
 
-#: src/gpawidgets.c:302 src/keygendlg.c:295
+#: src/gpawidgets.c:289 src/keygendlg.c:291
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -993,20 +735,7 @@
 "!FATALE FOUT!\n"
 "Ongeldige invoeg modus voor verval datum."
 
-#: src/gpawizard.c:260
-#, fuzzy
-msgid "_Back"
-msgstr "/_Backup...."
-
-#: src/gpawizard.c:267
-msgid "_Forward"
-msgstr ""
-
-#: src/gpawizard.c:274
-msgid "_Apply"
-msgstr ""
-
-#: src/gpgmetools.c:58
+#: src/gpgmetools.c:59
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -1023,7 +752,7 @@
 "\n"
 "De toepassing zal worden afgesloten"
 
-#: src/gpgmetools.c:72
+#: src/gpgmetools.c:73
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -1042,8 +771,17 @@
 "Dit is waarschijnlijk een fout in GPA.\n"
 "GPA zal nu proberen te herstellen van deze fout."
 
-#: src/gpgmetools.c:477
+#: src/gpgmetools.c:139
+#, c-format
 msgid ""
+"The file %s already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Het bestand %s bestaat al.\n"
+"Wilt u het bestand overschrijven?"
+
+#: src/gpgmetools.c:486
+msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
 "* a safe place.                                                        *\n"
@@ -1055,7 +793,7 @@
 "* Bewaar dit bestand aub in een veilige plaats.                        *\n"
 "************************************************************************\n"
 
-#: src/gpgmetools.c:482
+#: src/gpgmetools.c:491
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -1063,109 +801,109 @@
 "De sleutel is gebackuped in dit bestand:\n"
 "\n"
 
-#: src/gpgmetools.c:543
+#: src/gpgmetools.c:552
 msgid "DSA and ElGamal (default)"
 msgstr "DSA en ElGamal (standaard)"
 
-#: src/gpgmetools.c:544
+#: src/gpgmetools.c:553
 msgid "DSA (sign only)"
 msgstr "DSA (alleen ondertekenen)"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:554
 msgid "RSA (sign only)"
 msgstr "DSA (alleen ondertekenen)"
 
-#: src/gpgmetools.c:581 src/gpgmetools.c:604 src/gpgmetools.c:621
-#: src/gpgmetools.c:932 src/gpgmetools.c:965
+#: src/gpgmetools.c:590 src/gpgmetools.c:613 src/gpgmetools.c:630
+#: src/gpgmetools.c:944 src/gpgmetools.c:977
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: src/gpgmetools.c:584
+#: src/gpgmetools.c:593
 msgid "Never"
 msgstr "Nooit"
 
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:596
 msgid "Marginal"
 msgstr "Marginaal"
 
-#: src/gpgmetools.c:590
+#: src/gpgmetools.c:599
 msgid "Full"
 msgstr "Volledig"
 
-#: src/gpgmetools.c:593
+#: src/gpgmetools.c:602
 msgid "Ultimate"
 msgstr "Ultiem"
 
-#: src/gpgmetools.c:619
+#: src/gpgmetools.c:628
 msgid "Incomplete"
 msgstr "Niet compleet"
 
-#: src/gpgmetools.c:625
+#: src/gpgmetools.c:634
 msgid "Fully Valid"
 msgstr "Volledig geldig"
 
-#: src/gpgmetools.c:659
+#: src/gpgmetools.c:668
 msgid "Please enter the passphrase for the following key:"
 msgstr "Geef aub het wachwoord in voor de volgende sleutel:"
 
-#: src/gpgmetools.c:667
+#: src/gpgmetools.c:676
 msgid "Wrong passphrase, please try again:"
 msgstr "Verkeerd wachtwoord, probeer aub opnieuw:"
 
-#: src/gpgmetools.c:692
+#: src/gpgmetools.c:701
 msgid "Enter Passphrase"
 msgstr "Wachtwoord ingeven"
 
-#: src/gpgmetools.c:814
+#: src/gpgmetools.c:826
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:904 src/verifydlg.c:269
+#: src/gpgmetools.c:916 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[Onbekende gebruiker ID]"
 
-#: src/gpgmetools.c:930 src/verifydlg.c:217
+#: src/gpgmetools.c:942 src/verifydlg.c:217
 msgid "Bad"
 msgstr "Slecht"
 
-#: src/gpgmetools.c:953
+#: src/gpgmetools.c:965
 msgid "Generic"
 msgstr "Algemeen"
 
-#: src/gpgmetools.c:956
+#: src/gpgmetools.c:968
 msgid "Persona"
 msgstr "Persoonlijk"
 
-#: src/gpgmetools.c:959
+#: src/gpgmetools.c:971
 msgid "Casual"
 msgstr "Gewoon"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:974
 msgid "Positive"
 msgstr "Positief"
 
-#: src/gpgmetools.c:980
+#: src/gpgmetools.c:992
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 "De sleutel kan gebruikt worden voor certificatie, onderteken en "
 "versleuteling."
 
-#: src/gpgmetools.c:983
+#: src/gpgmetools.c:995
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "De sleutel kan gebruikt worden voor certificatie en ondertekenen, maar niet "
 "voor versleuteling."
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:1001
 msgid "The key can be used for certification and encryption."
 msgstr "De sleutel kan gebruikt worden voor certificatie en versleuteling."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:1004
 msgid "The key can be used only for certification."
 msgstr "De sleutel kan alleen gebruikt worden voor certificatie."
 
-#: src/gpgmetools.c:1000
+#: src/gpgmetools.c:1012
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -1173,82 +911,71 @@
 "De sleutel kan enkel gebruikt worden voor ondertekenen en encryptie, maar "
 "niet voor certificatie."
 
-#: src/gpgmetools.c:1003
+#: src/gpgmetools.c:1015
 msgid "The key can be used only for signing."
 msgstr "De sleutel kan alleen gebruikt worden voor ondertekenen."
 
-#: src/gpgmetools.c:1008
+#: src/gpgmetools.c:1020
 msgid "The key can be used only for encryption."
 msgstr "De sleutel kan alleen gebruikt worden voor versleuteling."
 
-#: src/gpgmetools.c:1011
+#: src/gpgmetools.c:1023
 msgid "This key is useless."
 msgstr "Deze sleutel is waardeloos."
 
-#: src/gtktools.c:320
+#: src/gtktools.c:48
 msgid "GPA Error"
 msgstr "GPA Fout"
 
-#: src/helpmenu.c:202
+#: src/helpmenu.c:83
 msgid "About GPA"
 msgstr "Over GPA"
 
-#: src/helpmenu.c:247
-msgid "Brought to you by:"
-msgstr "U gebracht door:"
+#: src/helpmenu.c:89
+#, fuzzy
+msgid "GPA is the GNU Privacy Assistant."
+msgstr "De GNU Privacy Assistent verstaan"
 
-#: src/helpmenu.c:284
+#: src/icons.c:199
 #, fuzzy
-msgid "GPA is Free Software under the"
-msgstr "GPA is vrije software onder de"
+msgid "_Verify"
+msgstr "Verifieer"
 
-#: src/helpmenu.c:288
-msgid "GNU General Public License."
-msgstr "GNU General Public Licentie."
+#: src/icons.c:200
+#, fuzzy
+msgid "_Encrypt"
+msgstr "Versleutel"
 
-#: src/helpmenu.c:292
-msgid "For news see:"
-msgstr "Voor nieuws zie:"
+#: src/icons.c:201
+#, fuzzy
+msgid "_Decrypt"
+msgstr " Ontsleutel "
 
-#: src/helpmenu.c:297
+#: src/icons.c:202
 #, fuzzy
-msgid "http://www.gpg4win.org"
-msgstr "http://www.gnupg.org"
+msgid "_Brief"
+msgstr "Beperkt"
 
-#: src/helpmenu.c:299
-msgid "http://www.gnupg.org"
-msgstr "http://www.gnupg.org"
+#: src/icons.c:203
+#, fuzzy
+msgid "_Detailed"
+msgstr "Details"
 
-#: src/helpmenu.c:382
+#: src/icons.c:204
 #, fuzzy
-msgid "GNU General Public License"
-msgstr "GNU General Public Licentie."
+msgid "_Keyring Editor"
+msgstr "Keyring Editor"
 
-#: src/helpmenu.c:409
+#: src/icons.c:205
 #, fuzzy
-msgid "_GNU General Public License"
-msgstr "GNU General Public Licentie."
+msgid "_Clipboard"
+msgstr "Naar _klembord"
 
-#: src/helpmenu.c:436
-msgid "Show Help Text\n"
-msgstr "Toon help text\n"
+#: src/icons.c:206
+#, fuzzy
+msgid "_File Manager"
+msgstr "bestandsbeheerder"
 
-#: src/helpmenu.c:444
-msgid "/_Help"
-msgstr "/_Help"
-
-#: src/helpmenu.c:446
-msgid "/Help/_Contents"
-msgstr "/Help/_Licentie"
-
-#: src/helpmenu.c:449
-msgid "/Help/_License"
-msgstr "/Help/_Licentie"
-
-#: src/helpmenu.c:450
-msgid "/Help/_About"
-msgstr "/Help/_Over GPA"
-
 #: src/keydeletedlg.c:41
 msgid "Removing Secret Key"
 msgstr "Verwijder geheime sleutel"
@@ -1295,23 +1022,27 @@
 msgid "Are you sure you want to delete this key?"
 msgstr "Weet u zeker dat je deze sleutel wilt verwijderen?"
 
-#: src/keyeditdlg.c:149
+#: src/keyeditdlg.c:147
 msgid "Edit Key"
 msgstr "Bewerk sleutel"
 
-#: src/keyeditdlg.c:165
+#: src/keyeditdlg.c:162
 msgid "Change _passphrase"
 msgstr "Verkeerd wachtwoord!"
 
-#: src/keyeditdlg.c:185
+#: src/keyeditdlg.c:182
 msgid "Change _expiration"
 msgstr "_Verander verval datum"
 
-#: src/keygendlg.c:58
+#: src/keygendlg.c:67
+msgid "You must enter a key size."
+msgstr ""
+
+#: src/keygendlg.c:72
 msgid "You must enter a User ID."
 msgstr ""
 
-#: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
+#: src/keygendlg.c:77 src/passwddlg.c:45
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -1319,7 +1050,7 @@
 "in \"Wachtwoord\" en \"Herhaal wachtwoord\",\n"
 "moet u hetzelfde wachtwoord herhalen."
 
-#: src/keygendlg.c:70 src/keygenwizard.c:314 src/passwddlg.c:52
+#: src/keygendlg.c:84 src/passwddlg.c:52
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1327,7 +1058,7 @@
 "U gaf geen wachtwoord in.\n"
 "Het is nodig om uw geheime sleutel te beschermen."
 
-#: src/keygendlg.c:83 src/keygenwizard.c:328 src/passwddlg.c:65
+#: src/keygendlg.c:97 src/passwddlg.c:65
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1339,23 +1070,25 @@
 "\n"
 "Geef aub een nieuw wachtwoord in."
 
-#: src/keygendlg.c:88 src/keygenwizard.c:333 src/passwddlg.c:70
+#: src/keygendlg.c:102 src/passwddlg.c:70
 msgid "_Enter new passphrase"
 msgstr "_Geef een nieuw wachtwoord in"
 
-#: src/keygendlg.c:89 src/keygenwizard.c:334 src/passwddlg.c:71
+#: src/keygendlg.c:104 src/passwddlg.c:71
 msgid "Take this one _anyway"
 msgstr "Neem deze _weg"
 
-#: src/keygendlg.c:144 src/keygenwizard.c:541
+#: src/keygendlg.c:150 src/keygenwizard.c:571 src/keygenwizard.c:584
+#: src/keygenwizard.c:594 src/keygenwizard.c:604 src/keygenwizard.c:616
+#: src/keygenwizard.c:633 src/keygenwizard.c:645
 msgid "Generate key"
 msgstr "Genereer sleutel"
 
-#: src/keygendlg.c:185
+#: src/keygendlg.c:177
 msgid "_Algorithm: "
 msgstr "_Versleutel algoritme: "
 
-#: src/keygendlg.c:197
+#: src/keygendlg.c:192
 msgid "_Key size (bits): "
 msgstr "_Sleutel grootte (Bits): "
 
@@ -1371,27 +1104,27 @@
 msgid "2048"
 msgstr "2048"
 
-#: src/keygendlg.c:216
+#: src/keygendlg.c:206
 msgid "_User ID: "
 msgstr "_Gebruik ID: "
 
-#: src/keygendlg.c:226
+#: src/keygendlg.c:217
 msgid "_Email: "
 msgstr "_E-Mail: "
 
-#: src/keygendlg.c:236
+#: src/keygendlg.c:226
 msgid "_Comment: "
 msgstr "_Commentaar: "
 
-#: src/keygendlg.c:248
+#: src/keygendlg.c:235
 msgid "_Passphrase: "
 msgstr "_Wachtwoord: "
 
-#: src/keygendlg.c:260
+#: src/keygendlg.c:246
 msgid "_Repeat passphrase: "
 msgstr "_Herhaal wachtwoord: "
 
-#: src/keygenwizard.c:152
+#: src/keygenwizard.c:172
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1403,19 +1136,16 @@
 "Uw naam zal deel uitmaken van de nieuwe sleutel en maak het eenvoudiger.voor "
 "anderen om sleutels te identificieren."
 
-#: src/keygenwizard.c:157
+#: src/keygenwizard.c:175
 msgid "Your Name:"
 msgstr "Uw naam:"
 
-#: src/keygenwizard.c:170
-msgid "Please insert your name"
-msgstr "Geef aub uw  naam in"
-
-#: src/keygenwizard.c:183
+#: src/keygenwizard.c:211
+#, fuzzy
 msgid ""
 "Please insert your email address.\n"
 "\n"
-" Your email address will be part of the new key to make it easier for others "
+"Your email address will be part of the new key to make it easier for others "
 "to identify keys. If you have several email addresses, you can add further "
 "email adresses later."
 msgstr ""
@@ -1425,27 +1155,40 @@
 "eenvoudigerom sleutels te identificieren. Als u meerdere E-mail adressen "
 "heeft, kan u later nog altijd E-mail adressen toevoegen."
 
-#: src/keygenwizard.c:190
+#: src/keygenwizard.c:215
 msgid "Your Email Address:"
 msgstr "Uw E-Mail adress:"
 
-#: src/keygenwizard.c:205
-msgid "Please insert your email address"
-msgstr "Geef aub uw E-mail adress in:"
-
-#: src/keygenwizard.c:239
+#: src/keygenwizard.c:319
 msgid "Please choose a passphrase for the new key."
 msgstr "Kies aub een wachtwoord voor de nieuwe sleutel."
 
-#: src/keygenwizard.c:248 src/passwddlg.c:108
+#: src/keygenwizard.c:326
+#, fuzzy
+msgid ""
+"In \"Passphrase\" and \"Repeat passphrase\", you must enter the same "
+"passphrase."
+msgstr ""
+"in \"Wachtwoord\" en \"Herhaal wachtwoord\",\n"
+"moet u hetzelfde wachtwoord herhalen."
+
+#: src/keygenwizard.c:335
+msgid "Warning: The passphrase you have entered is not very secure."
+msgstr ""
+
+#: src/keygenwizard.c:350
+msgid "Quality: "
+msgstr ""
+
+#: src/keygenwizard.c:358 src/passwddlg.c:111
 msgid "Passphrase: "
 msgstr "Wachtwoord: "
 
-#: src/keygenwizard.c:261 src/passwddlg.c:117
+#: src/keygenwizard.c:370 src/passwddlg.c:120
 msgid "Repeat Passphrase: "
 msgstr "Herhaal wachtwoord: "
 
-#: src/keygenwizard.c:358
+#: src/keygenwizard.c:412
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1456,15 +1199,15 @@
 "gemaakt is.\n"
 "Wilt u een reserve kopie maken?"
 
-#: src/keygenwizard.c:367
+#: src/keygenwizard.c:420
 msgid "Create _backup copy"
 msgstr "Maak _backup kopie"
 
-#: src/keygenwizard.c:374 src/keyring.c:739 src/keyring.c:767
+#: src/keygenwizard.c:425 src/keyring.c:737 src/keyring.c:763
 msgid "Do it _later"
 msgstr "Doe het _later"
 
-#: src/keygenwizard.c:402
+#: src/keygenwizard.c:454
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1474,7 +1217,7 @@
 "\n"
 "Zelfs op snelle computers kan dit even duren. Wees aub geduldig."
 
-#: src/keygenwizard.c:411
+#: src/keygenwizard.c:463
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1492,43 +1235,43 @@
 "This might take a few seconds."
 msgstr ""
 
-#: src/keylist.c:559
+#: src/keylist.c:547
 msgid ""
 "This columns lists the type of the certificate.  A 'P' denotes OpenPGP and a "
 "'X' denotes X.509 (S/MIME)."
 msgstr ""
 
-#: src/keylist.c:568
+#: src/keylist.c:556
 #, fuzzy
 msgid "The key ID is a short number to identify a certificate."
 msgstr "De sleutel kan alleen gebruikt worden voor certificatie."
 
-#: src/keylist.c:581
+#: src/keylist.c:569
 msgid "The Expiry Date is the date until the certificate is valid."
 msgstr ""
 
-#: src/keylist.c:591 src/ownertrustdlg.c:122
+#: src/keylist.c:579 src/ownertrustdlg.c:123
 msgid "Owner Trust"
 msgstr "Eigenaars vertrouwen"
 
-#: src/keylist.c:592
+#: src/keylist.c:580
 msgid ""
 "The Owner Trust has been set by you and describes how far you trust the "
 "holder of the certificate to correctly sign (certify) other certificates.  "
 "It is only meaningful for OpenPGP."
 msgstr ""
 
-#: src/keylist.c:604
+#: src/keylist.c:592
 msgid "Validity"
 msgstr "Geldigheid"
 
-#: src/keylist.c:605
+#: src/keylist.c:593
 msgid ""
 "The Validity describes the trust level the system has in this certificate.  "
 "That is how sure it is that the named user is actually that user."
 msgstr ""
 
-#: src/keylist.c:619
+#: src/keylist.c:607
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
@@ -1538,7 +1281,7 @@
 msgid "No keys selected for signing."
 msgstr "Geen sleutels geselecteerd voor ondertekening."
 
-#: src/keyring.c:734
+#: src/keyring.c:732
 msgid ""
 "You do not have a private key yet. Do you want to generate one now "
 "(recommended) or do it later?"
@@ -1546,11 +1289,11 @@
 "U heeft nog geen geheime sleutel. Wil u er nu een genereren (aanbevolen) of "
 "dit later doen?"
 
-#: src/keyring.c:738
+#: src/keyring.c:736
 msgid "_Generate key now"
 msgstr "_Genereer sleutel nu"
 
-#: src/keyring.c:761
+#: src/keyring.c:757
 msgid ""
 "You do not have a backup copy of your private key yet. Do you want to backup "
 "your key now (recommended) or do it later?"
@@ -1558,339 +1301,247 @@
 "U heeft nog geen backup van uw geheime sleutel. Wil u uw sleutel nubackuppen "
 "(aanbevolen) of dit later doen?"
 
-#: src/keyring.c:766
+#: src/keyring.c:762
 msgid "_Backup key now"
 msgstr "_Backup sleutel nu"
 
-#: src/keyring.c:883
-msgid "/_Keys"
-msgstr "/_Sleutels"
-
-#: src/keyring.c:884
-msgid "/Keys/_Refresh"
-msgstr ""
-
 #: src/keyring.c:886
 #, fuzzy
-msgid "/Keys/sep0"
-msgstr "/Bestand/sep1"
+msgid "_Keys"
+msgstr "/_Sleutels"
 
 #: src/keyring.c:887
-msgid "/Keys/_New Key..."
-msgstr "/Sleutels/_Nieuwe Sleutel..."
+#, fuzzy
+msgid "_Server"
+msgstr "/_Server"
 
-#: src/keyring.c:889
-msgid "/Keys/_Delete Keys..."
-msgstr "/Sleutels/_Verwijder sleutels...."
+#: src/keyring.c:901
+#, fuzzy
+msgid "Select all certificates"
+msgstr "_genereerd terugtrekkings certificaat"
 
-#: src/keyring.c:891
-msgid "/Keys/sep1"
-msgstr "/Bestand/sep1"
+#: src/keyring.c:906
+msgid "Refresh the keyring"
+msgstr ""
 
-#: src/keyring.c:892
-msgid "/Keys/_Sign Keys..."
-msgstr "/Sleutels/_Onderteken Sleutels..."
+#: src/keyring.c:907
+#, fuzzy
+msgid "_New key..."
+msgstr "/Sleutels/_Nieuwe Sleutel..."
 
-#: src/keyring.c:893
-msgid "/Keys/Set _Owner Trust..."
-msgstr "/Sleutels/Verander _Eigenaars Vertrouwen...."
+#: src/keyring.c:908
+#, fuzzy
+msgid "Generate a new key"
+msgstr "Genereer sleutel"
 
-#: src/keyring.c:894
-msgid "/Keys/_Edit Private Key..."
-msgstr "/Sleutels/_Bewerk Sleutel..."
+#: src/keyring.c:909
+#, fuzzy
+msgid "_Delete keys"
+msgstr "/_Verwijder sleutels...."
 
-#: src/keyring.c:895
-msgid "/Keys/sep2"
-msgstr "/Bestand/sep2"
+#: src/keyring.c:910
+msgid "Remove the selected key"
+msgstr "Verwijder de geselecteerde sleutel"
 
-#: src/keyring.c:896
-msgid "/Keys/_Import Keys..."
-msgstr "/Sleutels/_Importeer Sleutels..."
+#: src/keyring.c:911
+#, fuzzy
+msgid "_Sign Keys..."
+msgstr "/_Onderteken Sleutels..."
 
-#: src/keyring.c:897
-msgid "/Keys/E_xport Keys..."
-msgstr "/Sleutels/E_xporteer Sleutels...."
+#: src/keyring.c:912
+msgid "Sign the selected key"
+msgstr "Onderteken de geselecteerde sleutel"
 
-#: src/keyring.c:898
-msgid "/Keys/_Backup..."
-msgstr "/Sleutels/_Backup...."
+#: src/keyring.c:913
+#, fuzzy
+msgid "Set _Owner Trust..."
+msgstr "/Verander _Eigenaars Vertrouwen...."
 
-#: src/keyring.c:901
-msgid "/_Server"
-msgstr "/_Server"
+#: src/keyring.c:914
+#, fuzzy
+msgid "Set owner trust of the selected key"
+msgstr "Verwijder de geselecteerde sleutel"
 
-#: src/keyring.c:902
-msgid "/Server/_Retrieve Keys..."
-msgstr "/Server/_Haal sleutels...."
+#: src/keyring.c:916
+#, fuzzy
+msgid "_Edit Private Key..."
+msgstr "/_Bewerk Sleutel..."
 
-#: src/keyring.c:903
-msgid "/Server/_Send Keys..."
-msgstr "/Server/_Stuur Sleutels..."
+#: src/keyring.c:917
+msgid "Edit the selected private key"
+msgstr "Bewerk de geselecteerde sleutel"
 
-#: src/keyring.c:908
+#: src/keyring.c:919
 #, fuzzy
-msgid "/Windows/_File Manager"
-msgstr "/Vensters/_Bestandsbeheerder"
+msgid "_Import Keys..."
+msgstr "Importeer sleutels"
 
-#: src/keyring.c:939
-msgid "/Keys/Export Keys..."
-msgstr "/Sleutels/Exporteer Sleutels..."
+#: src/keyring.c:920
+msgid "Import Keys"
+msgstr "Importeer sleutels"
 
-#: src/keyring.c:944
-msgid "/Keys/Delete Keys..."
-msgstr "/Sleutels/Verwijder sleutels...."
+#: src/keyring.c:921
+#, fuzzy
+msgid "E_xport Keys..."
+msgstr "/E_xporteer Sleutels...."
 
-#: src/keyring.c:952
-msgid "/Server/Send Keys..."
-msgstr "/Server/Stuur Sleutels..."
+#: src/keyring.c:922
+msgid "Export Keys"
+msgstr "Exporteer Sleutels"
 
-#: src/keyring.c:959
-msgid "/Keys/Set Owner Trust..."
-msgstr "/Sleutels/Verander Eigenaars Vertrouwen...."
+#: src/keyring.c:923
+#, fuzzy
+msgid "_Backup..."
+msgstr "/_Backup...."
 
-#: src/keyring.c:966
-msgid "/Keys/Sign Keys..."
-msgstr "/Sleutels/Onderteken Sleutels..."
+#: src/keyring.c:924
+#, fuzzy
+msgid "Backup key"
+msgstr "Sleutels Backuppen"
 
-#: src/keyring.c:972
-msgid "/Keys/Edit Private Key..."
-msgstr "/Sleutels/Bewerk Sleutel..."
+#: src/keyring.c:927
+#, fuzzy
+msgid "_Retrieve Keys..."
+msgstr "/Server/_Haal sleutels...."
 
-#: src/keyring.c:977
-msgid "/Keys/Backup..."
-msgstr "/Sleutels/Backup...."
+#: src/keyring.c:928
+#, fuzzy
+msgid "Retrieve keys from server"
+msgstr "Ontvang sleutel van server:"
 
-#: src/keyring.c:994
-msgid "/_Copy"
-msgstr "/_Kopieer"
-
-#: src/keyring.c:996
-msgid "/_Paste"
-msgstr "/_Plak"
-
-#: src/keyring.c:998
-msgid "/_Delete Keys..."
-msgstr "/_Verwijder sleutels...."
-
-#: src/keyring.c:1001
-msgid "/_Sign Keys..."
+#: src/keyring.c:930
+#, fuzzy
+msgid "_Send Keys..."
 msgstr "/_Onderteken Sleutels..."
 
-#: src/keyring.c:1002
-msgid "/Set _Owner Trust..."
-msgstr "/Verander _Eigenaars Vertrouwen...."
+#: src/keyring.c:931
+#, fuzzy
+msgid "Send keys to server"
+msgstr "Stel keyserver in"
 
-#: src/keyring.c:1003
-msgid "/_Edit Private Key..."
-msgstr "/_Bewerk Sleutel..."
+#: src/keyring.c:937
+msgid "Show Brief Keylist"
+msgstr "Toon beperkte sleutellijst"
 
-#: src/keyring.c:1005
-msgid "/E_xport Keys..."
-msgstr "/E_xporteer Sleutels...."
+#: src/keyring.c:939
+msgid "Show Key Details"
+msgstr "Toon Sleutel Details"
 
-#: src/keyring.c:1006
-msgid "/Se_nd Keys to Server..."
-msgstr ""
+#: src/keyring.c:1063
+msgid "Edit"
+msgstr "Bewerk"
 
-#: src/keyring.c:1007
-msgid "/_Backup..."
-msgstr "/_Backup...."
+#: src/keyring.c:1065
+msgid "Delete"
+msgstr "Wissen"
 
-#: src/keyring.c:1018
-msgid "/Set Owner Trust..."
-msgstr "/Verander Eigenaars Vertrouwen...."
+#: src/keyring.c:1067
+msgid "Sign"
+msgstr "Ondertekenen"
 
-#: src/keyring.c:1025
-msgid "/Sign Keys..."
-msgstr "/Onderteken Sleutels..."
+#: src/keyring.c:1069
+msgid "Export"
+msgstr "Exporteer"
 
-#: src/keyring.c:1031
-msgid "/Edit Private Key..."
-msgstr "/Bewerk Sleutel..."
+#: src/keyring.c:1071
+msgid "Import"
+msgstr "Importeer"
 
-#: src/keyring.c:1036
-msgid "/Backup..."
-msgstr "/Backup...."
-
-#: src/keyring.c:1106
+#: src/keyring.c:1178
 msgid "Subkeys"
 msgstr "Subsleutels"
 
-#: src/keyring.c:1180 src/keysigndlg.c:110
+#: src/keyring.c:1252 src/keysigndlg.c:106
 msgid "Fingerprint:"
 msgstr "Vingerafdruk:"
 
-#: src/keyring.c:1182
+#: src/keyring.c:1254
 msgid "Expires at:"
 msgstr "Vervalt op:"
 
-#: src/keyring.c:1184
+#: src/keyring.c:1256
 msgid "Owner Trust:"
 msgstr "Eigenaars Vertrouwen:"
 
-#: src/keyring.c:1186
+#: src/keyring.c:1258
 msgid "Key Validity:"
 msgstr "Sleutel geldigheid:"
 
-#: src/keyring.c:1188
+#: src/keyring.c:1260
 msgid "Key Type:"
 msgstr "Sleutel Type:"
 
-#: src/keyring.c:1190
+#: src/keyring.c:1262
 msgid "Created at:"
 msgstr "Gemaakt op:"
 
-#: src/keyring.c:1193
+#: src/keyring.c:1265
 msgid "Details"
 msgstr "Details"
 
-#: src/keyring.c:1201
+#: src/keyring.c:1273
 msgid "Show signatures on user name:"
 msgstr "Controleer ondertekeningen van het geselecteerde bestand"
 
-#: src/keyring.c:1225
+#: src/keyring.c:1298
 msgid "Signatures"
 msgstr "Ondertekeningen"
 
-#: src/keyring.c:1249
+#: src/keyring.c:1322
 msgid "The key has both a private and a public part"
 msgstr "De sleutel heeft een geheim en publiek deel"
 
-#: src/keyring.c:1252
+#: src/keyring.c:1325
 msgid "The key has only a public part"
 msgstr "De sleutel heeft enkel een publiek deel"
 
-#: src/keyring.c:1287
+#: src/keyring.c:1360
 #, c-format
 msgid "%s %u bits"
 msgstr ""
 
-#: src/keyring.c:1312
+#: src/keyring.c:1385
 msgid "No keys selected"
 msgstr "Geen sleutels geselecteerd"
 
-#: src/keyring.c:1315
+#: src/keyring.c:1388
 #, fuzzy, c-format
 msgid "%d key selected"
 msgid_plural "%d keys selected"
 msgstr[0] "%d sleutels geselecteerd"
 msgstr[1] "%d sleutels geselecteerd"
 
-#: src/keyring.c:1347
+#: src/keyring.c:1423
 msgid "All signatures"
 msgstr "Ondertekeningen"
 
-#: src/keyring.c:1552
-msgid "Edit"
-msgstr "Bewerk"
-
-#: src/keyring.c:1553
-msgid "Edit the selected private key"
-msgstr "Bewerk de geselecteerde sleutel"
-
-#: src/keyring.c:1554
-msgid "edit key"
-msgstr "bewerk sleutel"
-
-#: src/keyring.c:1562
-msgid "Remove the selected key"
-msgstr "Verwijder de geselecteerde sleutel"
-
-#: src/keyring.c:1563
-msgid "remove key"
-msgstr "verwijder sleutel"
-
-#: src/keyring.c:1571
-msgid "Sign the selected key"
-msgstr "Onderteken de geselecteerde sleutel"
-
-#: src/keyring.c:1571
-msgid "sign key"
-msgstr "onderteken sleutel"
-
 #: src/keyring.c:1578
-msgid "Import"
-msgstr "Importeer"
-
-#: src/keyring.c:1579
-msgid "Import Keys"
-msgstr "Importeer sleutels"
-
-#: src/keyring.c:1579
-msgid "import keys"
-msgstr "importeer sleutels"
-
-#: src/keyring.c:1584
-msgid "Export"
-msgstr "Exporteer"
-
-#: src/keyring.c:1585
-msgid "Export Keys"
-msgstr "Exporteer Sleutels"
-
-#: src/keyring.c:1585
-msgid "export keys"
-msgstr "exporteer sleutels"
-
-#: src/keyring.c:1598
-msgid "Brief"
-msgstr "Beperkt"
-
-#: src/keyring.c:1598
-msgid "Show Brief Keylist"
-msgstr "Toon beperkte sleutellijst"
-
-#: src/keyring.c:1599
-msgid "brief"
-msgstr "beperkt"
-
-#: src/keyring.c:1610
-msgid "Detailed"
-msgstr "Details"
-
-#: src/keyring.c:1610
-msgid "Show Key Details"
-msgstr "Toon Sleutel Details"
-
-#: src/keyring.c:1611
-msgid "detailed"
-msgstr "gedetailleerd"
-
-#: src/keyring.c:1639
-msgid "Refresh the keyring"
-msgstr ""
-
-#: src/keyring.c:1640
-msgid "refresh keyring"
-msgstr ""
-
-#: src/keyring.c:1711
 #, fuzzy
 msgid "Selected default key:"
 msgstr "Selecteer Standaard Sleutel:"
 
-#: src/keyring.c:1721
+#: src/keyring.c:1588
 #, fuzzy
 msgid "No default key selected in the preferences."
 msgstr "Geen sleutels geselecteerd voor export."
 
-#: src/keyring.c:1833
+#: src/keyring.c:1701
 msgid "GNU Privacy Assistant - Keyring Editor"
 msgstr "GNU Privacy Assistent - Keyring Editor"
 
-#: src/keyring.c:1865
+#: src/keyring.c:1728
 msgid "Keyring Editor"
 msgstr "Keyring Editor"
 
-#: src/keysigndlg.c:60
+#: src/keysigndlg.c:59
 msgid "Sign Key"
 msgstr "Onderteken Sleutel"
 
-#: src/keysigndlg.c:76
+#: src/keysigndlg.c:72
 msgid "Do you want to sign the following key?"
 msgstr "Wilt u de volgende sleutel ondertekenen?"
 
-#: src/keysigndlg.c:120
+#: src/keysigndlg.c:116
 msgid ""
 "Check the name and fingerprint carefully to be sure that it really is the "
 "key you want to sign."
@@ -1898,19 +1549,19 @@
 "Controleer de naam en de vingerafdruk zorgvuldig en wees zeker dat dit echt "
 "de sleutel is die uw wilt ondertekenen."
 
-#: src/keysigndlg.c:128
+#: src/keysigndlg.c:124
 msgid "All user names in this key will be signed."
 msgstr "Alle gebruiker namen in deze sleutel zullen worden ondertekend."
 
-#: src/keysigndlg.c:134
+#: src/keysigndlg.c:130
 msgid "The key will be signed with your default private key."
 msgstr "De sleutel zal ondertekend worden met uw standaard geheime sleutel."
 
-#: src/keysigndlg.c:141
+#: src/keysigndlg.c:137
 msgid "Sign only _locally"
 msgstr "Onderteken alleen _lokaal"
 
-#: src/options.c:316
+#: src/options.c:323
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -1919,26 +1570,26 @@
 "beschikbaar.\n"
 "GPA zal proberen om automatisch een nieuwe standaard sleutel te vinden."
 
-#: src/ownertrustdlg.c:106
+#: src/ownertrustdlg.c:107
 msgid "Change key ownertrust"
 msgstr "Verander sleutel eigenaars vertrouwen"
 
-#: src/ownertrustdlg.c:130
+#: src/ownertrustdlg.c:131
 msgid "_Unknown"
 msgstr "_Onbekent"
 
-#: src/ownertrustdlg.c:135
+#: src/ownertrustdlg.c:136
 msgid ""
 "You don't know how much to trust this user to verify other people's keys.\n"
 msgstr ""
 "U weet niet hoeveel u deze gebruiker kan vertrouwen om andere sleutels te "
 "valideren.\n"
 
-#: src/ownertrustdlg.c:145
+#: src/ownertrustdlg.c:146
 msgid "_Never"
 msgstr "_Nooit"
 
-#: src/ownertrustdlg.c:150
+#: src/ownertrustdlg.c:151
 msgid ""
 "You don't trust this user at all to verify the validity of other people's "
 "keys at all.\n"
@@ -1946,11 +1597,11 @@
 "U vertrouwt deze gebruiker helemaal niet om de geldigheid van andere "
 "sleutels te controleren.\n"
 
-#: src/ownertrustdlg.c:160
+#: src/ownertrustdlg.c:161
 msgid "_Marginal"
 msgstr "_Marginaal"
 
-#: src/ownertrustdlg.c:165
+#: src/ownertrustdlg.c:166
 msgid ""
 "You don't trust this user's ability to verify the validity of other people's "
 "keys enough to consider keys valid based on his/her sole word.\n"
@@ -1964,11 +1615,11 @@
 "deze gebruiker als geldig beschouwen als het ook is getekend door tenminste "
 "twee andere marginaal vertrouwde gebruikers met geldige sleutels\n"
 
-#: src/ownertrustdlg.c:182
+#: src/ownertrustdlg.c:183
 msgid "_Full"
 msgstr "_Volledig"
 
-#: src/ownertrustdlg.c:187
+#: src/ownertrustdlg.c:188
 msgid ""
 "You trust this user's ability to verify the validity of other people's keys "
 "so much, that you'll consider valid any key signed by him/her, provided this "
@@ -1978,11 +1629,11 @@
 "controleren dat u elke sleutel ondertekend door hem/haar als geldig zult "
 "beschouwen, op voorwaarde dat deze gebruiker's sleutels geldig is.\n"
 
-#: src/ownertrustdlg.c:200
+#: src/ownertrustdlg.c:201
 msgid "U_ltimate"
 msgstr "U_ltiem"
 
-#: src/ownertrustdlg.c:205
+#: src/ownertrustdlg.c:206
 msgid ""
 "You consider this key valid, and trust the user so much that you will "
 "consider any key signed by him/her fully valid.\n"
@@ -2073,37 +1724,149 @@
 "Er is geen plugin beschikbaar voor het keyserver\n"
 "protocol dat u specifieerde."
 
-#: src/server_access.c:528 src/server_access.c:574
+#: src/server_access.c:528 src/server_access.c:572
 msgid "The keyserver you specified is not valid"
 msgstr "De keyserver die u specifieerde is niet geldig"
 
-#: src/settingsdlg.c:59
+#: src/settingsdlg.c:133 src/siglist.c:135
+msgid "Local"
+msgstr "Lokaal"
+
+#: src/settingsdlg.c:134
 #, fuzzy
+msgid "Local, Keyserver"
+msgstr "_KeyServer: "
+
+#: src/settingsdlg.c:135
+#, fuzzy
+msgid "Local, PKA"
+msgstr "Lokaal"
+
+#: src/settingsdlg.c:136
+msgid "Local, PKA, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:137
+msgid "Local, Keyserver, PKA"
+msgstr ""
+
+#: src/settingsdlg.c:138
+#, fuzzy
+msgid "Local, kDNS"
+msgstr "Lokaal"
+
+#: src/settingsdlg.c:139
+msgid "Local, kDNS, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:140
+msgid "PKA"
+msgstr ""
+
+#: src/settingsdlg.c:141
+msgid "kDNS"
+msgstr ""
+
+#: src/settingsdlg.c:142
+msgid "Custom"
+msgstr ""
+
+#: src/settingsdlg.c:208
+#, fuzzy
+msgid "<b>User interface</b>"
+msgstr "Gebruik ge_avanceerde mode:"
+
+#: src/settingsdlg.c:215
+#, fuzzy
+msgid "Use _advanced mode"
+msgstr "Gebruik ge_avanceerde mode:"
+
+#: src/settingsdlg.c:221
+#, fuzzy
+msgid "Show advanced _options"
+msgstr "Toon bestands operaties"
+
+#: src/settingsdlg.c:272
+msgid ""
+"No default key has been selected.  This may lead to problems when signing or "
+"encrypting.  For example you might later not be able to read a mail written "
+"by you and encrypted to someone else.\n"
+"\n"
+"Please consider creating your own key and select it then."
+msgstr ""
+
+#: src/settingsdlg.c:278
+msgid "Continue without a default key"
+msgstr ""
+
+#: src/settingsdlg.c:280
+#, fuzzy
+msgid "Let me select a default key"
+msgstr "Selecteer Standaard Sleutel:"
+
+#: src/settingsdlg.c:305
+#, fuzzy
 msgid "<b>Default _key</b>"
 msgstr "_Standaard sleutel:"
 
-#: src/settingsdlg.c:111
+#: src/settingsdlg.c:405
 #, fuzzy
 msgid "<b>Default key_server</b>"
 msgstr "_Standaard KeyServer:"
 
-#: src/settingsdlg.c:158
+#: src/settingsdlg.c:602
 #, fuzzy
-msgid "<b>Use _advanced mode</b>"
-msgstr "Gebruik ge_avanceerde mode:"
+msgid "<b>Auto key _locate</b>"
+msgstr "_Standaard KeyServer:"
 
-#: src/settingsdlg.c:193
-msgid "Settings"
-msgstr "Instellingen"
+#: src/settingsdlg.c:612
+msgid ""
+"The list of methods to locate keys via an email address.\n"
+"All given methods are used in turn until a matching key is found.  The "
+"supported methods are:\n"
+" Local\n"
+"   - Use the local keyring.\n"
+" Keyserver\n"
+"   - Use the default keyserver.\n"
+" PKA\n"
+"   - Use the Public Key Association.\n"
+" kDNS\n"
+"   - Use kDNS with the nameserver below.\n"
+" Custom\n"
+"   - Configured in the backend dialog.\n"
+msgstr ""
 
+#: src/settingsdlg.c:627
+msgid "Method:"
+msgstr ""
+
+#: src/settingsdlg.c:644
+msgid "The IP address of the nameserver used for the kDNS method."
+msgstr ""
+
+#: src/settingsdlg.c:646
+#, fuzzy
+msgid "kDNS Server:"
+msgstr "/_Server"
+
+#: src/settingsdlg.c:740
+#, fuzzy
+msgid "The URL given for the keyserver is not valid."
+msgstr "De keyserver die u specifieerde is niet geldig"
+
+#: src/settingsdlg.c:749
+msgid "The data given for \"Auto key locate\" is not valid."
+msgstr ""
+
+#: src/settingsdlg.c:886
+#, fuzzy
+msgid "GNU Privacy Assistant - Settings"
+msgstr "GNU Privacy Assistent - Keyring Editor"
+
 #: src/siglist.c:128
 msgid "Level"
 msgstr "Niveau"
 
-#: src/siglist.c:135
-msgid "Local"
-msgstr "Lokaal"
-
 #: src/verifydlg.c:116
 #, fuzzy
 msgid "Verify documents"
@@ -2131,6 +1894,360 @@
 msgid "Signatures:"
 msgstr "Ondertekeningen:"
 
+#~ msgid "/File/C_lear"
+#~ msgstr "/Bestand/_Leeg maken"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Bestand/_Openen"
+
+#, fuzzy
+#~ msgid "/File/Save _As"
+#~ msgstr "/Bestand/_Sluiten"
+
+#~ msgid "/File/sep1"
+#~ msgstr "/Bestand/sep1"
+
+#~ msgid "/File/_Sign"
+#~ msgstr "/Bestand/_Ondertekenen"
+
+#~ msgid "/File/_Verify"
+#~ msgstr "/Bestand/_Ontsleutelen"
+
+#~ msgid "/File/_Encrypt"
+#~ msgstr "/Bestand/_Versleutelen"
+
+#~ msgid "/File/_Decrypt"
+#~ msgstr "/Bestand/_Ontsleutelen"
+
+#~ msgid "/File/sep2"
+#~ msgstr "/Bestand/sep2"
+
+#~ msgid "/File/_Close"
+#~ msgstr "/Bestand/_Sluiten"
+
+#~ msgid "/File/_Quit"
+#~ msgstr "/Bestand/_Stoppen"
+
+#, fuzzy
+#~ msgid "/Edit/_Undo"
+#~ msgstr "/Bewerk/_Kopieer"
+
+#, fuzzy
+#~ msgid "/Edit/_Redo"
+#~ msgstr "/Bewerk/_Kopieer"
+
+#, fuzzy
+#~ msgid "/Edit/sep0"
+#~ msgstr "/Bestand/sep2"
+
+#, fuzzy
+#~ msgid "/Edit/Cut"
+#~ msgstr "/Bewerk/Kopieer"
+
+#~ msgid "/Edit/_Copy"
+#~ msgstr "/Bewerk/_Kopieer"
+
+#~ msgid "/Edit/_Paste"
+#~ msgstr "/Bewerk/_Plak"
+
+#, fuzzy
+#~ msgid "/Edit/_Delete"
+#~ msgstr "/Bewerk/_Plak"
+
+#~ msgid "/Edit/sep1"
+#~ msgstr "/Bestand/sep1"
+
+#~ msgid "/Edit/Select _All"
+#~ msgstr "/Bewerk/Selecteer _Alles"
+
+#~ msgid "/Edit/sep2"
+#~ msgstr "/Bestand/sep2"
+
+#~ msgid "/Edit/Pr_eferences..."
+#~ msgstr "/Bewerk/Voork_euren..."
+
+#, fuzzy
+#~ msgid "/Edit/_Backend Preferences..."
+#~ msgstr "/Bewerk/Voork_euren..."
+
+#~ msgid "/_Windows"
+#~ msgstr "/_Vensters"
+
+#~ msgid "/Windows/_Keyring Editor"
+#~ msgstr "/Vensters/_Keyring Editor"
+
+#~ msgid "/Windows/_Filemanager"
+#~ msgstr "/Vensters/_Bestandsbeheerder"
+
+#, fuzzy
+#~ msgid "/Windows/_Clipboard"
+#~ msgstr "/Vensters/_Bestandsbeheerder"
+
+#~ msgid "/Edit/Copy"
+#~ msgstr "/Bewerk/Kopieer"
+
+#, fuzzy
+#~ msgid "/Edit/Delete"
+#~ msgstr "/Bewerk/Selecteer _Alles"
+
+#, fuzzy
+#~ msgid "/Edit/Paste"
+#~ msgstr "/Bewerk/_Plak"
+
+#~ msgid "open file"
+#~ msgstr "open bestand"
+
+#, fuzzy
+#~ msgid "save file as"
+#~ msgstr "sluit bestand"
+
+#, fuzzy
+#~ msgid "cut the selection"
+#~ msgstr "Versleutel het geselecteerde bestand"
+
+#, fuzzy
+#~ msgid "copy the selection"
+#~ msgstr "Versleutel het geselecteerde bestand"
+
+#, fuzzy
+#~ msgid "paste the clipboard"
+#~ msgstr "Naar _klembord"
+
+#, fuzzy
+#~ msgid "Sign the selected text"
+#~ msgstr "Onderteken de geselecteerde sleutel"
+
+#, fuzzy
+#~ msgid "verify text"
+#~ msgstr "verifieer bestand"
+
+#, fuzzy
+#~ msgid "encrypt text"
+#~ msgstr "versleutel bestand"
+
+#, fuzzy
+#~ msgid "decrypt text"
+#~ msgstr "ontsleutel bestand"
+
+#~ msgid "preferences"
+#~ msgstr "voorkeuren"
+
+#, fuzzy
+#~ msgid "Open the keyring editor"
+#~ msgstr "open keyring editor (standaard)"
+
+#, fuzzy
+#~ msgid "keyring editor"
+#~ msgstr "Keyring Editor"
+
+#, fuzzy
+#~ msgid "Open the file manager"
+#~ msgstr "Open de bestandsbeheerder"
+
+#~ msgid "file manager"
+#~ msgstr "bestandsbeheerder"
+
+#~ msgid "Help"
+#~ msgstr "Help"
+
+#~ msgid "help"
+#~ msgstr "help"
+
+#~ msgid "/File/Sign"
+#~ msgstr "/Bestand/_Ondertekenen"
+
+#~ msgid "/File/Verify"
+#~ msgstr "/Bestand/verifieren"
+
+#~ msgid "/File/Encrypt"
+#~ msgstr "/Bestand/_Versleutelen"
+
+#~ msgid "/File/Decrypt"
+#~ msgstr "/Bestand/_Ontsleutelen"
+
+#~ msgid "close files"
+#~ msgstr "sluit bestand"
+
+#~ msgid "sign file"
+#~ msgstr "onderteken bestand"
+
+#~ msgid "verify file"
+#~ msgstr "verifieer bestand"
+
+#~ msgid "encrypt file"
+#~ msgstr "versleutel bestand"
+
+#~ msgid "decrypt file"
+#~ msgstr "ontsleutel bestand"
+
+#, fuzzy
+#~ msgid "Open the clipboard"
+#~ msgstr "Naar _klembord"
+
+#, fuzzy
+#~ msgid "clipboard"
+#~ msgstr "Naar _klembord"
+
+#~ msgid "_Backup to file:"
+#~ msgstr "_Backup naar bestand:"
+
+#~ msgid "B_rowse..."
+#~ msgstr "_Bladeren..."
+
+#, fuzzy
+#~ msgid "_Back"
+#~ msgstr "/_Backup...."
+
+#~ msgid "Brought to you by:"
+#~ msgstr "U gebracht door:"
+
+#, fuzzy
+#~ msgid "GPA is Free Software under the"
+#~ msgstr "GPA is vrije software onder de"
+
+#~ msgid "GNU General Public License."
+#~ msgstr "GNU General Public Licentie."
+
+#~ msgid "For news see:"
+#~ msgstr "Voor nieuws zie:"
+
+#, fuzzy
+#~ msgid "http://www.gpg4win.org"
+#~ msgstr "http://www.gnupg.org"
+
+#~ msgid "http://www.gnupg.org"
+#~ msgstr "http://www.gnupg.org"
+
+#, fuzzy
+#~ msgid "GNU General Public License"
+#~ msgstr "GNU General Public Licentie."
+
+#, fuzzy
+#~ msgid "_GNU General Public License"
+#~ msgstr "GNU General Public Licentie."
+
+#~ msgid "Show Help Text\n"
+#~ msgstr "Toon help text\n"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Help"
+
+#~ msgid "/Help/_Contents"
+#~ msgstr "/Help/_Licentie"
+
+#~ msgid "/Help/_License"
+#~ msgstr "/Help/_Licentie"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/Help/_Over GPA"
+
+#~ msgid "Please insert your name"
+#~ msgstr "Geef aub uw  naam in"
+
+#~ msgid "Please insert your email address"
+#~ msgstr "Geef aub uw E-mail adress in:"
+
+#, fuzzy
+#~ msgid "/Keys/sep0"
+#~ msgstr "/Bestand/sep1"
+
+#~ msgid "/Keys/_Delete Keys..."
+#~ msgstr "/Sleutels/_Verwijder sleutels...."
+
+#~ msgid "/Keys/sep1"
+#~ msgstr "/Bestand/sep1"
+
+#~ msgid "/Keys/_Sign Keys..."
+#~ msgstr "/Sleutels/_Onderteken Sleutels..."
+
+#~ msgid "/Keys/Set _Owner Trust..."
+#~ msgstr "/Sleutels/Verander _Eigenaars Vertrouwen...."
+
+#~ msgid "/Keys/_Edit Private Key..."
+#~ msgstr "/Sleutels/_Bewerk Sleutel..."
+
+#~ msgid "/Keys/sep2"
+#~ msgstr "/Bestand/sep2"
+
+#~ msgid "/Keys/_Import Keys..."
+#~ msgstr "/Sleutels/_Importeer Sleutels..."
+
+#~ msgid "/Keys/E_xport Keys..."
+#~ msgstr "/Sleutels/E_xporteer Sleutels...."
+
+#~ msgid "/Keys/_Backup..."
+#~ msgstr "/Sleutels/_Backup...."
+
+#~ msgid "/Server/_Send Keys..."
+#~ msgstr "/Server/_Stuur Sleutels..."
+
+#, fuzzy
+#~ msgid "/Windows/_File Manager"
+#~ msgstr "/Vensters/_Bestandsbeheerder"
+
+#~ msgid "/Keys/Export Keys..."
+#~ msgstr "/Sleutels/Exporteer Sleutels..."
+
+#~ msgid "/Keys/Delete Keys..."
+#~ msgstr "/Sleutels/Verwijder sleutels...."
+
+#~ msgid "/Server/Send Keys..."
+#~ msgstr "/Server/Stuur Sleutels..."
+
+#~ msgid "/Keys/Set Owner Trust..."
+#~ msgstr "/Sleutels/Verander Eigenaars Vertrouwen...."
+
+#~ msgid "/Keys/Sign Keys..."
+#~ msgstr "/Sleutels/Onderteken Sleutels..."
+
+#~ msgid "/Keys/Edit Private Key..."
+#~ msgstr "/Sleutels/Bewerk Sleutel..."
+
+#~ msgid "/Keys/Backup..."
+#~ msgstr "/Sleutels/Backup...."
+
+#~ msgid "/_Copy"
+#~ msgstr "/_Kopieer"
+
+#~ msgid "/_Paste"
+#~ msgstr "/_Plak"
+
+#~ msgid "/Set Owner Trust..."
+#~ msgstr "/Verander Eigenaars Vertrouwen...."
+
+#~ msgid "/Sign Keys..."
+#~ msgstr "/Onderteken Sleutels..."
+
+#~ msgid "/Edit Private Key..."
+#~ msgstr "/Bewerk Sleutel..."
+
+#~ msgid "/Backup..."
+#~ msgstr "/Backup...."
+
+#~ msgid "edit key"
+#~ msgstr "bewerk sleutel"
+
+#~ msgid "remove key"
+#~ msgstr "verwijder sleutel"
+
+#~ msgid "sign key"
+#~ msgstr "onderteken sleutel"
+
+#~ msgid "import keys"
+#~ msgstr "importeer sleutels"
+
+#~ msgid "export keys"
+#~ msgstr "exporteer sleutels"
+
+#~ msgid "brief"
+#~ msgstr "beperkt"
+
+#~ msgid "detailed"
+#~ msgstr "gedetailleerd"
+
+#~ msgid "Settings"
+#~ msgstr "Instellingen"
+
 #~ msgid "Sign files"
 #~ msgstr "Bestanden ondertekenen"
 
@@ -2191,9 +2308,6 @@
 #~ msgid "E_xport to file:"
 #~ msgstr "E_xporteer naar bestand "
 
-#~ msgid "_Key server:"
-#~ msgstr "_KeyServer: "
-
 #~ msgid "Import Key"
 #~ msgstr "Importeer sleutel"
 
@@ -2275,9 +2389,6 @@
 #~ msgid "The currently selected filename."
 #~ msgstr "De huidige geselecteerde bestandsnaam."
 
-#~ msgid "Show file operations"
-#~ msgstr "Toon bestands operaties"
-
 #~ msgid "Whether buttons for creating/manipulating files should be displayed."
 #~ msgstr ""
 #~ "Of knoppen voor maken/manipuleren van bestanden getoond moeten worden."
@@ -2385,9 +2496,6 @@
 #~ msgid "_Delete"
 #~ msgstr "_Verwijderen"
 
-#~ msgid "Delete"
-#~ msgstr "Wissen"
-
 #~ msgid ""
 #~ "The file name \"%s\" contains symbols that are not allowed in filenames"
 #~ msgstr ""
@@ -2455,9 +2563,6 @@
 #~ "\"wachtwoord\" en \"Herhaal wachtwoord\"\n"
 #~ "U moet hetzelfde wachtwoord invoeren."
 
-#~ msgid "generate re_vocation certificate"
-#~ msgstr "_genereerd terugtrekkings certificaat"
-
 #~ msgid "_send to key server"
 #~ msgstr "_zend naar keyserver"
 
@@ -2538,9 +2643,6 @@
 #~ "Een fout heeft zich voorgedaan terwijl de gevraagde\n"
 #~ "sleutel ontvangen werdt van de keyserver."
 
-#~ msgid "Receive key from server"
-#~ msgstr "Ontvang sleutel van server:"
-
 #~ msgid "_Key ID: "
 #~ msgstr "_Sleutel ID:"
 
@@ -2550,9 +2652,6 @@
 #~ msgid "Remove"
 #~ msgstr "Verwijder"
 
-#~ msgid "Set key server"
-#~ msgstr "Stel keyserver in"
-
 #~ msgid "_Key server: "
 #~ msgstr "_Key-Server: "
 

Modified: trunk/po/pl.po
===================================================================
--- trunk/po/pl.po	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/pl.po	2008-05-08 12:53:41 UTC (rev 891)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gpa-0.7\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-03-12 12:29+0100\n"
+"POT-Creation-Date: 2008-05-08 14:51+0200\n"
 "PO-Revision-Date: 2004-08-22 02:23+0200\n"
 "Last-Translator: Emilian Nowak <emil5 at go2.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
@@ -15,425 +15,212 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/clipboard.c:367 src/fileman.c:350
+#: src/clipboard.c:376 src/fileman.c:392
 msgid "Open File"
 msgstr "OtwÃ³rz plik"
 
-#: src/clipboard.c:395 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "Komunikat GPA"
 
 #. TRANSLATORS: The arguments are the filename, the integer size
 #. and the unit (such as KB or MB).
-#: src/clipboard.c:412
+#: src/clipboard.c:421
 #, fuzzy, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
 msgstr ""
 "Plik %s juÅ¼ istnieje.\n"
 "Czy chcesz go nadpisaÄ‡?"
 
-#: src/clipboard.c:481
+#: src/clipboard.c:542
 msgid "Save As..."
 msgstr ""
 
-#: src/clipboard.c:522 src/clipboard.c:552 src/clipboard.c:582
-#: src/clipboard.c:612 src/clipboard.c:1113 src/fileman.c:675
-#: src/keyring.c:1657
+#: src/clipboard.c:583 src/clipboard.c:613 src/clipboard.c:643
+#: src/clipboard.c:673 src/clipboard.c:1034
 msgid "Clipboard"
 msgstr ""
 
-#: src/clipboard.c:692 src/fileman.c:472 src/keyring.c:863
-msgid "/_File"
+#: src/clipboard.c:755 src/fileman.c:515 src/keyring.c:884
+#, fuzzy
+msgid "_File"
 msgstr "/_Plik"
 
-#: src/clipboard.c:693 src/fileman.c:474
-msgid "/File/C_lear"
-msgstr "/Plik/Wy_czyÅ›Ä‡"
-
-#: src/clipboard.c:694 src/fileman.c:473
-msgid "/File/_Open"
-msgstr "/Plik/_OtwÃ³rz"
-
-#: src/clipboard.c:695
+#: src/clipboard.c:756 src/fileman.c:516 src/keyring.c:885
 #, fuzzy
-msgid "/File/Save _As"
-msgstr "/Plik/Z_amknij"
-
-#: src/clipboard.c:697 src/fileman.c:475
-msgid "/File/sep1"
-msgstr "/Plik/sep1"
-
-#: src/clipboard.c:698 src/fileman.c:476
-msgid "/File/_Sign"
-msgstr "/Plik/_Podpisz"
-
-#: src/clipboard.c:699 src/fileman.c:477
-msgid "/File/_Verify"
-msgstr "/Plik/_Weryfikuj"
-
-#: src/clipboard.c:700 src/fileman.c:478
-msgid "/File/_Encrypt"
-msgstr "/Plik/_Zaszyfruj"
-
-#: src/clipboard.c:701 src/fileman.c:479
-msgid "/File/_Decrypt"
-msgstr "/Plik/O_dszyfruj"
-
-#: src/clipboard.c:702 src/fileman.c:480
-msgid "/File/sep2"
-msgstr "/Plik/sep2"
-
-#: src/clipboard.c:703 src/fileman.c:481 src/keyring.c:864
-msgid "/File/_Close"
-msgstr "/Plik/Z_amknij"
-
-#: src/clipboard.c:704 src/fileman.c:482 src/keyring.c:866
-msgid "/File/_Quit"
-msgstr "/Plik/Za_koÅ„cz"
-
-#: src/clipboard.c:707 src/fileman.c:485 src/keyring.c:869
-msgid "/_Edit"
+msgid "_Edit"
 msgstr "/_Edycja"
 
-#: src/clipboard.c:710
-#, fuzzy
-msgid "/Edit/_Undo"
-msgstr "/Edycja/_Kopiuj"
-
-#: src/clipboard.c:711
-#, fuzzy
-msgid "/Edit/_Redo"
-msgstr "/Edycja/_Kopiuj"
-
-#: src/clipboard.c:712
-#, fuzzy
-msgid "/Edit/sep0"
-msgstr "/Edycja/sep2"
-
-#: src/clipboard.c:714 src/clipboard.c:750
-#, fuzzy
-msgid "/Edit/Cut"
-msgstr "/Edycja/Kopiuj"
-
-#: src/clipboard.c:715 src/keyring.c:870
-msgid "/Edit/_Copy"
-msgstr "/Edycja/_Kopiuj"
-
-#: src/clipboard.c:716 src/keyring.c:872
-msgid "/Edit/_Paste"
-msgstr "/Edycja/_Wklej"
-
-#: src/clipboard.c:717
-#, fuzzy
-msgid "/Edit/_Delete"
-msgstr "/Edycja/_Wklej"
-
-#: src/clipboard.c:718 src/keyring.c:874
-msgid "/Edit/sep1"
-msgstr "/Edycja/sep1"
-
-#: src/clipboard.c:719 src/fileman.c:486 src/keyring.c:875
-msgid "/Edit/Select _All"
-msgstr "/Edycja/Wybierz _wszystko"
-
-#: src/clipboard.c:721 src/fileman.c:487 src/keyring.c:876
-msgid "/Edit/sep2"
-msgstr "/Edycja/sep2"
-
-#: src/clipboard.c:722 src/fileman.c:488 src/keyring.c:877
-msgid "/Edit/Pr_eferences..."
-msgstr "/Edycja/_Ustawienia..."
-
-#: src/clipboard.c:724 src/fileman.c:490 src/keyring.c:879
-#, fuzzy
-msgid "/Edit/_Backend Preferences..."
-msgstr "/Edycja/_Ustawienia..."
-
-#: src/clipboard.c:728 src/fileman.c:494 src/keyring.c:906
-msgid "/_Windows"
-msgstr "/_Okna"
-
-#: src/clipboard.c:729 src/fileman.c:495 src/keyring.c:907
-msgid "/Windows/_Keyring Editor"
-msgstr "/Okna/Edytor zbioru _kluczy"
-
-#: src/clipboard.c:730 src/fileman.c:496
-msgid "/Windows/_Filemanager"
-msgstr "/Okna/MenadÅ¼er _plikÃ³w"
-
-#: src/clipboard.c:731 src/fileman.c:497 src/keyring.c:909
-#, fuzzy
-msgid "/Windows/_Clipboard"
-msgstr "/Okna/MenadÅ¼er _plikÃ³w"
-
-#: src/clipboard.c:758 src/keyring.c:948
-msgid "/Edit/Copy"
-msgstr "/Edycja/Kopiuj"
-
-#: src/clipboard.c:766
-#, fuzzy
-msgid "/Edit/Delete"
-msgstr "/Edycja/Wybierz _wszystko"
-
-#: src/clipboard.c:774
-#, fuzzy
-msgid "/Edit/Paste"
-msgstr "/Edycja/_Wklej"
-
-#: src/clipboard.c:879
+#: src/clipboard.c:760
 msgid "Clear buffer"
 msgstr ""
 
-#: src/clipboard.c:879
-msgid "clear buffer"
-msgstr ""
-
-#: src/clipboard.c:887 src/fileman.c:602
+#: src/clipboard.c:762 src/fileman.c:520
 msgid "Open a file"
 msgstr "Otwiera plik"
 
-#: src/clipboard.c:887 src/fileman.c:602
-msgid "open file"
-msgstr "otwÃ³rz plik"
-
-#: src/clipboard.c:892
+#: src/clipboard.c:764
 #, fuzzy
 msgid "Save to a file"
 msgstr "Otwiera plik"
 
-#: src/clipboard.c:892
+#: src/clipboard.c:766
 #, fuzzy
-msgid "save file as"
-msgstr "zamknij pliki"
+msgid "Sign buffer text"
+msgstr "podpisuje klucz"
 
-#: src/clipboard.c:900
+#: src/clipboard.c:768
 #, fuzzy
-msgid "Cut the selection"
-msgstr "Szyfruje wybrany plik"
+msgid "Check signatures of buffer text"
+msgstr "Sprawdza podpis wybranego pliku"
 
-#: src/clipboard.c:901
+#: src/clipboard.c:770
 #, fuzzy
-msgid "cut the selection"
+msgid "Encrypt the buffer text"
 msgstr "Szyfruje wybrany plik"
 
-#: src/clipboard.c:907
+#: src/clipboard.c:772
 #, fuzzy
-msgid "Copy the selection"
-msgstr "Szyfruje wybrany plik"
+msgid "Decrypt the buffer text"
+msgstr "Deszyfruje wybrany plik"
 
-#: src/clipboard.c:908
-#, fuzzy
-msgid "copy the selection"
-msgstr "Szyfruje wybrany plik"
-
-#: src/clipboard.c:914
-msgid "Paste the clipboard"
+#: src/clipboard.c:774
+msgid "Close the buffer"
 msgstr ""
 
-#: src/clipboard.c:915
-msgid "paste the clipboard"
+#: src/clipboard.c:776 src/fileman.c:534 src/keyring.c:893
+msgid "Quit the program"
 msgstr ""
 
-#: src/clipboard.c:925 src/fileman.c:612 src/keyring.c:1570
-msgid "Sign"
-msgstr "Podpisz"
-
-#: src/clipboard.c:926
+#: src/clipboard.c:782
 #, fuzzy
-msgid "Sign the selected text"
-msgstr "Podpisuje wybrany klucz"
+msgid "Undo the last action"
+msgstr "Szyfruje wybrany plik"
 
-#: src/clipboard.c:927
-#, fuzzy
-msgid "sign text"
-msgstr "podpisuje klucz"
+#: src/clipboard.c:784
+msgid "Redo the last undone action"
+msgstr ""
 
-#: src/clipboard.c:935 src/fileman.c:623
-msgid "Verify"
-msgstr "Weryfikuj"
-
-#: src/clipboard.c:936
+#: src/clipboard.c:787
 #, fuzzy
-msgid "Check signatures of selected text"
-msgstr "Sprawdza podpis wybranego pliku"
+msgid "Cut the selection"
+msgstr "Szyfruje wybrany plik"
 
-#: src/clipboard.c:937
+#: src/clipboard.c:789 src/keyring.c:897
 #, fuzzy
-msgid "verify text"
-msgstr "weryfikuj plik"
-
-#: src/clipboard.c:945 src/fileman.c:634
-msgid "Encrypt"
-msgstr "Zaszyfruj"
-
-#: src/clipboard.c:946
-#, fuzzy
-msgid "Encrypt the selected text"
+msgid "Copy the selection"
 msgstr "Szyfruje wybrany plik"
 
-#: src/clipboard.c:947
-#, fuzzy
-msgid "encrypt text"
-msgstr "zaszyfruj plik"
+#: src/clipboard.c:791 src/keyring.c:899
+msgid "Paste the clipboard"
+msgstr ""
 
-#: src/clipboard.c:955 src/fileman.c:645
-msgid "Decrypt"
-msgstr "Odszyfruj"
-
-#: src/clipboard.c:956
+#: src/clipboard.c:793
 #, fuzzy
-msgid "Decrypt the selected text"
+msgid "Delete the selected text"
 msgstr "Deszyfruje wybrany plik"
 
-#: src/clipboard.c:957
-#, fuzzy
-msgid "decrypt text"
-msgstr "odszyfruj plik"
+#: src/clipboard.c:795
+msgid "Select the entire document"
+msgstr ""
 
-#: src/clipboard.c:967 src/fileman.c:658 src/keyring.c:1631
+#: src/clipboard.c:902 src/fileman.c:625
 #, fuzzy
-msgid "Open the preferences dialog"
-msgstr "Otwiera okno dialogowe z ustawieniami"
-
-#: src/clipboard.c:968 src/fileman.c:659 src/keyring.c:1632
-msgid "preferences"
-msgstr "ustawienia"
-
-#: src/clipboard.c:975 src/fileman.c:666
-#, fuzzy
 msgid "Keyring"
 msgstr "Edytor zbioru kluczy"
 
-#: src/clipboard.c:976 src/fileman.c:667
-#, fuzzy
-msgid "Open the keyring editor"
-msgstr "otwiera edytor zbioru kluczy (domyÅ›lne)"
-
-#: src/clipboard.c:977 src/fileman.c:668
-#, fuzzy
-msgid "keyring editor"
-msgstr "Edytor zbioru kluczy"
-
-#: src/clipboard.c:983 src/keyring.c:1648
+#: src/clipboard.c:904 src/keyring.c:1073
 msgid "Files"
 msgstr "Pliki"
 
-#: src/clipboard.c:984 src/keyring.c:1649
+#: src/clipboard.c:1004
 #, fuzzy
-msgid "Open the file manager"
-msgstr "Otwiera okno menedÅ¼era plikÃ³w"
-
-#: src/clipboard.c:985 src/keyring.c:1650
-msgid "file manager"
-msgstr "menedÅ¼er plikÃ³w"
-
-#: src/clipboard.c:992 src/fileman.c:684 src/keyring.c:1665
-msgid "Help"
-msgstr "Pomoc"
-
-#: src/clipboard.c:993 src/fileman.c:685 src/keyring.c:1666
-msgid "Understanding the GNU Privacy Assistant"
-msgstr ""
-
-#: src/clipboard.c:994 src/fileman.c:686 src/keyring.c:1667
-msgid "help"
-msgstr "pomoc"
-
-#: src/clipboard.c:1084
-#, fuzzy
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Privacy Assistant - MenedÅ¼er plikÃ³w "
 
-#: src/confdialog.c:993
+#: src/confdialog.c:994
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default values"
 msgstr ""
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default value"
 msgstr ""
 
-#: src/confdialog.c:1146
+#: src/confdialog.c:1147
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1155
+#: src/confdialog.c:1156
 msgid "Use default argument"
 msgstr ""
 
-#: src/confdialog.c:1280
+#: src/confdialog.c:1281
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1325
+#: src/confdialog.c:1326
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1334
+#: src/confdialog.c:1332
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1346
+#: src/confdialog.c:1351
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1350
+#: src/confdialog.c:1355
 #, fuzzy
 msgid "Level:"
 msgstr "Poziom"
 
-#: src/confdialog.c:1359
+#: src/confdialog.c:1364
 #, fuzzy
 msgid "Basic"
 msgstr "/_Kopia zapasowa..."
 
-#: src/confdialog.c:1360
+#: src/confdialog.c:1365
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1361
+#: src/confdialog.c:1366
 #, fuzzy
 msgid "Expert"
 msgstr "Eksport"
 
-#: src/encryptdlg.c:142 src/expirydlg.c:116 src/filesigndlg.c:133
-#: src/gpabackupop.c:292 src/gpaprogressdlg.c:146 src/gparecvkeydlg.c:96
-#: src/gpawizard.c:289 src/gpgmetools.c:696 src/keygendlg.c:149
-#: src/ownertrustdlg.c:111 src/passwddlg.c:100
-msgid "_Cancel"
-msgstr ""
-
-#: src/encryptdlg.c:143
+#: src/encryptdlg.c:139
 #, fuzzy
 msgid "Encrypt documents"
 msgstr "Zaszyfruj pliki"
 
-#: src/encryptdlg.c:174
+#: src/encryptdlg.c:156
 msgid "_Public Keys"
 msgstr "Klucze _Publiczne"
 
-#: src/encryptdlg.c:177
+#: src/encryptdlg.c:179 src/icons.c:198
 msgid "_Sign"
 msgstr "_Podpisz"
 
-#: src/encryptdlg.c:201 src/filesigndlg.c:185
+#: src/encryptdlg.c:185
 msgid "Sign _as "
 msgstr "Podpisz _jako "
 
-#: src/encryptdlg.c:215 src/filesigndlg.c:187
+#: src/encryptdlg.c:215 src/filesigndlg.c:227
 msgid "A_rmor"
 msgstr "Opa_kowanie ASCII"
 
@@ -441,147 +228,100 @@
 msgid "Please provide a correct date."
 msgstr "ProszÄ™ podaÄ‡ prawidÅ‚owÄ… datÄ™."
 
-#: src/expirydlg.c:111
+#: src/expirydlg.c:108
 msgid "Change expiry date"
 msgstr "Zmiana daty waÅ¼noÅ›ci"
 
-#: src/expirydlg.c:129
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+msgid "_Cancel"
+msgstr ""
+
+#: src/expirydlg.c:124
 msgid "_never expire"
 msgstr "_nigdy nie wygasa"
 
-#: src/expirydlg.c:134
+#: src/expirydlg.c:129
 msgid "_expire on:"
 msgstr "_wygasa dnia:"
 
-#: src/fileman.c:355 src/fileman.c:953
-msgid "The file is already open."
-msgstr "Ten plik jest juÅ¼ otwarty"
-
-#: src/fileman.c:516
-msgid "/File/Sign"
-msgstr "/Plik/Podpisz"
-
-#: src/fileman.c:521
-msgid "/File/Verify"
-msgstr "/Plik/Weryfikuj"
-
-#: src/fileman.c:526
-msgid "/File/Encrypt"
-msgstr "/Plik/Zaszyfruj"
-
-#: src/fileman.c:531
-msgid "/File/Decrypt"
-msgstr "/Plik/Odszyfruj"
-
-#: src/fileman.c:606
+#: src/fileman.c:522
 msgid "Close all files"
 msgstr "Zamyka wszystkie pliki"
 
-#: src/fileman.c:606
-msgid "close files"
-msgstr "zamknij pliki"
-
-#: src/fileman.c:613
+#: src/fileman.c:524
 msgid "Sign the selected file"
 msgstr "Podpisuje wybrany pliki"
 
-#: src/fileman.c:614
-msgid "sign file"
-msgstr "podpisz plik"
-
-#: src/fileman.c:624
+#: src/fileman.c:526
 msgid "Check signatures of selected file"
 msgstr "Sprawdza podpis wybranego pliku"
 
-#: src/fileman.c:625
-msgid "verify file"
-msgstr "weryfikuj plik"
-
-#: src/fileman.c:635
+#: src/fileman.c:528
 msgid "Encrypt the selected file"
 msgstr "Szyfruje wybrany plik"
 
-#: src/fileman.c:636
-msgid "encrypt file"
-msgstr "zaszyfruj plik"
-
-#: src/fileman.c:646
+#: src/fileman.c:530
 msgid "Decrypt the selected file"
 msgstr "Deszyfruje wybrany plik"
 
-#: src/fileman.c:647
-msgid "decrypt file"
-msgstr "odszyfruj plik"
+#: src/fileman.c:532
+msgid "Close the window"
+msgstr ""
 
-#: src/fileman.c:676 src/keyring.c:1658
+#: src/fileman.c:538
 #, fuzzy
-msgid "Open the clipboard"
-msgstr "Otwiera okno menedÅ¼era plikÃ³w"
+msgid "Select all files"
+msgstr "Zamyka wszystkie pliki"
 
-#: src/fileman.c:677 src/keyring.c:1659
-msgid "clipboard"
-msgstr ""
-
-#: src/fileman.c:785
+#: src/fileman.c:731
 msgid "File"
 msgstr "Plik"
 
-#: src/fileman.c:850
+#: src/fileman.c:796
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - MenedÅ¼er plikÃ³w "
 
-#: src/fileman.c:876
+#: src/fileman.c:819
 #, fuzzy
 msgid "File Manager"
 msgstr "menedÅ¼er plikÃ³w"
 
-#: src/filesigndlg.c:134
+#: src/fileman.c:895
+msgid "The file is already open."
+msgstr "Ten plik jest juÅ¼ otwarty"
+
+#: src/filesigndlg.c:171
 msgid "Sign documents"
 msgstr ""
 
-#: src/filesigndlg.c:144
-msgid "Signing Mode"
+#: src/filesigndlg.c:180
+#, fuzzy
+msgid "<b>Sign _as</b>"
+msgstr "Podpisz _jako "
+
+#: src/filesigndlg.c:201
+#, fuzzy
+msgid "<b>Signing Mode</b>"
 msgstr "Tryb podpisywania"
 
-#: src/filesigndlg.c:152
-msgid "si_gn and compress"
+#: src/filesigndlg.c:211
+#, fuzzy
+msgid "Si_gn and compress"
 msgstr "po_dpisz i skompresuj"
 
-#: src/filesigndlg.c:158
-msgid "_cleartext signature"
+#: src/filesigndlg.c:217
+#, fuzzy
+msgid "Clear_text signature"
 msgstr "podpisz _czystym tekstem"
 
-#: src/filesigndlg.c:165
+#: src/filesigndlg.c:223
 #, fuzzy
-msgid "_detached signature"
+msgid "_Detached signature"
 msgstr "podpisz _czystym tekstem"
 
-#: src/gpabackupop.c:213 src/gpgmetools.c:138
+#: src/gpabackupop.c:208
 #, c-format
 msgid ""
-"The file %s already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Plik %s juÅ¼ istnieje.\n"
-"Czy chcesz go nadpisaÄ‡?"
-
-#: src/gpabackupop.c:216 src/gpaexportserverop.c:134
-#: src/gpafileencryptop.c:455 src/gpafileverifyop.c:178 src/gpgmetools.c:141
-#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:62
-#: src/settingsdlg.c:165
-msgid "_Yes"
-msgstr "_Tak"
-
-#: src/gpabackupop.c:217 src/gpaexportserverop.c:135
-#: src/gpafileencryptop.c:456 src/gpafileverifyop.c:179 src/gpgmetools.c:142
-#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:64
-#: src/settingsdlg.c:168
-msgid "_No"
-msgstr "_Nie"
-
-#: src/gpabackupop.c:229
-#, c-format
-msgid ""
 "A copy of your secret key has been made to the file:\n"
 "\n"
 "\t\"%s\"\n"
@@ -597,31 +337,19 @@
 "naleÅ¼yty sposÃ³b \n"
 "(przykÅ‚adowo: na oddzielnej dyskietce przechowywanej w bezpiecznym miejscu)"
 
-#: src/gpabackupop.c:244
+#: src/gpabackupop.c:223
 msgid "An error ocurred during the backup operation."
 msgstr ""
 
-#: src/gpabackupop.c:260
+#: src/gpabackupop.c:245
 msgid "Backup key to file"
 msgstr "Wykonaj kopiÄ™ zapasowÄ… klucza do pliku"
 
-#: src/gpabackupop.c:287
-msgid "Backup Keys"
-msgstr "Kopia zaspasowa kluczy"
-
-#: src/gpabackupop.c:311
+#: src/gpabackupop.c:255
 #, c-format
 msgid "Generating backup of key: %s"
 msgstr "Generowanie kopii zapasowej klucza: %s"
 
-#: src/gpabackupop.c:317
-msgid "_Backup to file:"
-msgstr "_Kopia zapasowa do pliku:"
-
-#: src/gpabackupop.c:329
-msgid "B_rowse..."
-msgstr "P_rzeglÄ…daj..."
-
 #: src/gpa.c:92
 #, fuzzy
 msgid "Output version information and exit"
@@ -642,26 +370,31 @@
 msgstr ""
 
 #: src/gpa.c:100
-msgid "Start only the UI server (implies --cms)"
+#, fuzzy
+msgid "Open the settings dialog"
+msgstr "Otwiera okno dialogowe z ustawieniami"
+
+#: src/gpa.c:102
+msgid "Enable the UI server (implies --cms)"
 msgstr ""
 
-#: src/gpa.c:102
+#: src/gpa.c:104
 #, fuzzy
 msgid "Read options from file"
 msgstr "odczytuje opcje z podanego pliku"
 
-#: src/gpa.c:293
+#: src/gpa.c:286
 msgid "[FILE...]"
 msgstr ""
 
-#: src/gpa.c:295
+#: src/gpa.c:288
 #, fuzzy
 msgid "Graphical frontend to GnuPG"
 msgstr ""
 "SkÅ‚adnia: gpa [opcje]\n"
 "NakÅ‚adka graficzna na GnuPG\n"
 
-#: src/gpa.c:296
+#: src/gpa.c:289
 msgid "Please report bugs to <"
 msgstr "Raporty o bÅ‚Ä™dach wysyÅ‚aj do <"
 
@@ -669,15 +402,15 @@
 msgid "The keys have been copied to the clipboard."
 msgstr "Klucze zostaÅ‚y skopiowane do schowka."
 
-#: src/gpaexportfileop.c:133
+#: src/gpaexportfileop.c:139
 msgid "Export public keys to file"
 msgstr "Eksport kluczy publicznych do pliku"
 
-#: src/gpaexportfileop.c:137
+#: src/gpaexportfileop.c:150
 msgid "_armor"
 msgstr "opa_kowanie ASCII"
 
-#: src/gpaexportfileop.c:171
+#: src/gpaexportfileop.c:182
 #, c-format
 msgid "The keys have been exported to %s."
 msgstr "Klucze zostaÅ‚y wyeksportowane do %s."
@@ -693,6 +426,18 @@
 "serwera kluczy (\"%s\").\n"
 "Na pewno chcesz rozpowszechniÄ‡ ten klucz?"
 
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:459
+#: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
+#: src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Tak"
+
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:460
+#: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
+#: src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_Nie"
+
 #: src/gpaexportserverop.c:187
 msgid "The keys have been sent to the server."
 msgstr "Klucze zostaÅ‚y wysÅ‚ane na serwer."
@@ -701,29 +446,29 @@
 msgid "Decrypting..."
 msgstr "Odszyfrowywanie..."
 
-#: src/gpafiledecryptop.c:358 src/gpafileverifyop.c:449
+#: src/gpafiledecryptop.c:367 src/gpafileverifyop.c:464
 #, fuzzy, c-format
 msgid "\"%s\" contained no OpenPGP data."
 msgstr "Plik \"%s\" nie zawieraÅ‚ Å¼adnych danych OpenPGP."
 
-#: src/gpafiledecryptop.c:359 src/gpafileverifyop.c:450
+#: src/gpafiledecryptop.c:368 src/gpafileverifyop.c:465
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no OpenPGPdata."
 msgstr "Plik \"%s\" nie zawieraÅ‚ Å¼adnych danych OpenPGP."
 
-#: src/gpafiledecryptop.c:369
+#: src/gpafiledecryptop.c:378
 #, fuzzy, c-format
 msgid "\"%s\" contained no valid encrypted data."
 msgstr "Plik \"%s\" nie zawieraÅ‚ zaszyfrowanych danych."
 
-#: src/gpafiledecryptop.c:371
+#: src/gpafiledecryptop.c:380
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no validencrypted data."
 msgstr "Plik \"%s\" nie zawieraÅ‚ zaszyfrowanych danych."
 
-#: src/gpafiledecryptop.c:380 src/gpafileencryptop.c:727
-#: src/gpafilesignop.c:510 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
-#: src/gpakeypasswdop.c:197 src/gpakeysignop.c:229
+#: src/gpafiledecryptop.c:389 src/gpafileencryptop.c:751
+#: src/gpafilesignop.c:525 src/gpafileverifyop.c:475 src/gpakeyexpireop.c:240
+#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:237
 msgid "Wrong passphrase!"
 msgstr "Niepoprawne hasÅ‚o!"
 
@@ -731,61 +476,60 @@
 msgid "Encrypting..."
 msgstr "Szyfrowanie..."
 
-#: src/gpafileencryptop.c:453 src/verifydlg.c:222
+#: src/gpafileencryptop.c:457 src/verifydlg.c:222
 msgid "Unknown Key"
 msgstr "Nieznany klucz"
 
-#: src/gpafileencryptop.c:469
+#: src/gpafileencryptop.c:473
 #, fuzzy
 msgid "You are going to encrypt a document using the following key:"
 msgstr "Zamierzasz zaszyfrowaÄ‡ plik za pomocÄ… nastÄ™pujÄ…cego klucza:"
 
-#: src/gpafileencryptop.c:475
+#: src/gpafileencryptop.c:479
 msgid "However, it is not certain that the key belongs to that person."
 msgstr "Nie ma jednak pewnoÅ›ci Å¼e klucz naleÅ¼y do tej osoby."
 
-#: src/gpafileencryptop.c:481
+#: src/gpafileencryptop.c:485
 msgid "Do you <b>really</b> want to use this key?"
 msgstr "Czy <b>naprawdÄ™</b> chcesz uÅ¼yÄ‡ tego klucza?"
 
-#: src/gpafileencryptop.c:502 src/gpafileencryptop.c:542 src/verifydlg.c:227
+#: src/gpafileencryptop.c:506 src/gpafileencryptop.c:546 src/verifydlg.c:227
 msgid "Revoked Key"
 msgstr "UniewaÅ¼niony klucz"
 
-#: src/gpafileencryptop.c:504 src/gpafileencryptop.c:544 src/gpawizard.c:281
-#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:422
-#: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
+#: src/gpafileencryptop.c:508 src/gpafileencryptop.c:548 src/gtktools.c:52
+#: src/gtktools.c:86 src/keyeditdlg.c:149 src/verifydlg.c:115
 msgid "_Close"
 msgstr "Z_amknij"
 
-#: src/gpafileencryptop.c:517
+#: src/gpafileencryptop.c:521
 msgid "The following key has been revoked by it's owner:"
 msgstr "Ten klucz zostaÅ‚ uniewaÅ¼niony przez swojego wÅ‚aÅ›ciciela:"
 
-#: src/gpafileencryptop.c:522 src/gpafileencryptop.c:565
+#: src/gpafileencryptop.c:526 src/gpafileencryptop.c:569
 msgid "And can not be used for encryption."
 msgstr "Nie moÅ¼na wykorzystywaÄ‡ tego klucza do szyfrowania."
 
-#: src/gpafileencryptop.c:557
+#: src/gpafileencryptop.c:561
 #, c-format
 msgid "The following key expired on %s:"
 msgstr "Ten klucz przekroczyÅ‚ swÃ³j termin waÅ¼noÅ›ci %s:"
 
-#: src/gpafileencryptop.c:641 src/gpafilesignop.c:414
+#: src/gpafileencryptop.c:600 src/gpafilesignop.c:448
+msgid ""
+"The selected certificates are not all of the same type. That is, you mixed "
+"OpenPGP and X.509 certificates. Please make sure to select only certificates "
+"of the same type."
+msgstr ""
+
+#: src/gpafileencryptop.c:675 src/gpafilesignop.c:434
 msgid "You didn't select any key for signing"
 msgstr "Nie wybrano Å¼adnego klucza do podpisywania"
 
-#: src/gpafilesignop.c:148
+#: src/gpafilesignop.c:157
 msgid "Signing..."
 msgstr "Podpisywanie..."
 
-#: src/gpafilesignop.c:428
-msgid ""
-"The selected certificates are not all of the same type. That is, you mixed "
-"OpenPGP and X.509 certificates. Please make sure to select only certificates "
-"of the same type."
-msgstr ""
-
 #: src/gpafileverifyop.c:101
 msgid "Verifying..."
 msgstr "Weryfikacja..."
@@ -807,15 +551,15 @@
 msgid "Generating Key..."
 msgstr "Generowanie klucza..."
 
-#: src/gpaimportfileop.c:131
+#: src/gpaimportfileop.c:132
 msgid "Import public keys from file"
 msgstr "Import kluczy publicznych z pliku"
 
-#: src/gpaimportop.c:197
+#: src/gpaimportop.c:196
 msgid "No keys were found."
 msgstr "Nie odnaleziono Å¼adnych kluczy."
 
-#: src/gpaimportop.c:205
+#: src/gpaimportop.c:204
 #, c-format
 msgid ""
 "%i public keys read\n"
@@ -832,35 +576,35 @@
 "%i tajnych kluczy zaimportowano\n"
 "%i tajnych kluczy nie ulegÅ‚o zmianie"
 
-#: src/gpakeyexpireop.c:239
+#: src/gpakeyexpireop.c:244
 msgid ""
 "Invalid time given.\n"
 "(you may not set the expiration time to the past.)"
 msgstr ""
 
-#: src/gpakeyselector.c:86 src/keylist.c:567 src/siglist.c:94
+#: src/gpakeyselector.c:86 src/keylist.c:555 src/siglist.c:94
 #: src/siglist.c:114 src/verifydlg.c:324
 msgid "Key ID"
 msgstr "ID klucza"
 
-#: src/gpakeyselector.c:95 src/keylist.c:618 src/siglist.c:100
+#: src/gpakeyselector.c:95 src/keylist.c:606 src/siglist.c:100
 #: src/siglist.c:143 src/verifydlg.c:336
 msgid "User Name"
 msgstr "Nazwa uÅ¼ytkownika"
 
-#: src/gpakeysignop.c:188
+#: src/gpakeysignop.c:191
 msgid "No private key for signing."
 msgstr "Brak klucza prywatnego do podpisu."
 
-#: src/gpakeysignop.c:233
+#: src/gpakeysignop.c:241
 msgid "This key has expired! Unable to sign."
 msgstr "Klucz straciÅ‚ waÅ¼noÅ›Ä‡! Nie moÅ¼na podpisaÄ‡."
 
-#: src/gpakeysignop.c:237
+#: src/gpakeysignop.c:245
 msgid "This key has already been signed with your own!"
 msgstr "Ten klucz zostaÅ‚ juÅ¼ podpisany przez ciebie!"
 
-#: src/gpakeysignop.c:242
+#: src/gpakeysignop.c:250
 msgid "You haven't selected a default key to sign with!"
 msgstr "Nie wybrano domyÅ›lnego klucza, ktÃ³ry ma posÅ‚uÅ¼yÄ‡ do podpisania!"
 
@@ -888,7 +632,7 @@
 msgid "unknown"
 msgstr "nieznany"
 
-#: src/gparecvkeydlg.c:101
+#: src/gparecvkeydlg.c:106
 msgid "Which key do you want to import? (The key must be specified by key ID)."
 msgstr "KtÃ³ry klucz chcesz importowaÄ‡? (NaleÅ¼y podaÄ‡ identyfikator klucza)."
 
@@ -912,7 +656,7 @@
 msgid "Size"
 msgstr "Rozmiar"
 
-#: src/gpasubkeylist.c:97 src/keyeditdlg.c:171 src/keylist.c:580
+#: src/gpasubkeylist.c:97 src/keyeditdlg.c:168 src/keylist.c:568
 msgid "Expiry Date"
 msgstr "Data koÅ„ca waÅ¼noÅ›ci"
 
@@ -932,16 +676,16 @@
 msgid "Can authenticate"
 msgstr "MoÅ¼na autoryzowaÄ‡"
 
-#: src/gpasubkeylist.c:137 src/gpgmetools.c:613 src/gpgmetools.c:821
-#: src/gpgmetools.c:940
+#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:833
+#: src/gpgmetools.c:952
 msgid "Revoked"
 msgstr "UniewaÅ¼niony"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:615 src/gpgmetools.c:936
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:948
 msgid "Expired"
 msgstr "Po terminie waÅ¼noÅ›ci"
 
-#: src/gpasubkeylist.c:145 src/gpgmetools.c:617
+#: src/gpasubkeylist.c:145 src/gpgmetools.c:626
 msgid "Disabled"
 msgstr "WyÅ‚Ä…czone"
 
@@ -949,41 +693,41 @@
 msgid "Unsigned"
 msgstr "Brak podpisÃ³w"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:927 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:939 src/verifydlg.c:212
 msgid "Valid"
 msgstr "Poprawny"
 
-#: src/gpawidgets.c:72 src/gpgmetools.c:661 src/gpgmetools.c:668
-#: src/keyring.c:1176 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
+#: src/keyring.c:1248 src/keysigndlg.c:100
 msgid "User Name:"
 msgstr "Nazwa uÅ¼ytkownika:"
 
-#: src/gpawidgets.c:72 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/keysigndlg.c:100
 msgid "User Names:"
 msgstr "Nazwy uÅ¼ytkownika:"
 
-#: src/gpawidgets.c:78 src/gpgmetools.c:662 src/gpgmetools.c:669
-#: src/keyring.c:1178
+#: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
+#: src/keyring.c:1250
 msgid "Key ID:"
 msgstr "ID klucza:"
 
-#: src/gpawidgets.c:194
+#: src/gpawidgets.c:180
 msgid "Expiration"
 msgstr "Data koÅ„ca waÅ¼noÅ›ci"
 
-#: src/gpawidgets.c:201
+#: src/gpawidgets.c:187
 msgid "_indefinitely valid"
 msgstr "_zawsze waÅ¼ny"
 
-#: src/gpawidgets.c:210
+#: src/gpawidgets.c:195
 msgid "expire _after"
 msgstr "traci waÅ¼noÅ›Ä‡ _po"
 
-#: src/gpawidgets.c:229
+#: src/gpawidgets.c:215
 msgid "expire o_n:"
 msgstr "traci waÅ¼noÅ›Ä‡ _dnia:"
 
-#: src/gpawidgets.c:302 src/keygendlg.c:295
+#: src/gpawidgets.c:289 src/keygendlg.c:291
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -991,20 +735,7 @@
 "!POWAÅ»NY BÅÄ„D!\n"
 "Wprowadzono niepoprwane dane okreÅ›lajÄ…ce datÄ™ koÅ„ca waÅ¼noÅ›ci."
 
-#: src/gpawizard.c:260
-#, fuzzy
-msgid "_Back"
-msgstr "/_Kopia zapasowa..."
-
-#: src/gpawizard.c:267
-msgid "_Forward"
-msgstr ""
-
-#: src/gpawizard.c:274
-msgid "_Apply"
-msgstr ""
-
-#: src/gpgmetools.c:58
+#: src/gpgmetools.c:59
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -1021,7 +752,7 @@
 "\n"
 "DziaÅ‚anie aplikacji zostanie za chwilÄ™ przerwane"
 
-#: src/gpgmetools.c:72
+#: src/gpgmetools.c:73
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -1041,8 +772,17 @@
 "bÅ‚Ä™dem w samym GPA.\n"
 "NastÄ…pi teraz prÃ³ba powrotu do normalnego dziaÅ‚ania GPA."
 
-#: src/gpgmetools.c:477
+#: src/gpgmetools.c:139
+#, c-format
 msgid ""
+"The file %s already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Plik %s juÅ¼ istnieje.\n"
+"Czy chcesz go nadpisaÄ‡?"
+
+#: src/gpgmetools.c:486
+msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
 "* a safe place.                                                        *\n"
@@ -1055,7 +795,7 @@
 "************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:482
+#: src/gpgmetools.c:491
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -1063,109 +803,109 @@
 "Kopia zapasowa tego klucza znajduje siÄ™ w pliku: \n"
 "\n"
 
-#: src/gpgmetools.c:543
+#: src/gpgmetools.c:552
 msgid "DSA and ElGamal (default)"
 msgstr "DSA oraz ElGamal (domyÅ›lne)"
 
-#: src/gpgmetools.c:544
+#: src/gpgmetools.c:553
 msgid "DSA (sign only)"
 msgstr "DSA (tylko do podpisywania)"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:554
 msgid "RSA (sign only)"
 msgstr "RSA (tylko do podpisywania)"
 
-#: src/gpgmetools.c:581 src/gpgmetools.c:604 src/gpgmetools.c:621
-#: src/gpgmetools.c:932 src/gpgmetools.c:965
+#: src/gpgmetools.c:590 src/gpgmetools.c:613 src/gpgmetools.c:630
+#: src/gpgmetools.c:944 src/gpgmetools.c:977
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: src/gpgmetools.c:584
+#: src/gpgmetools.c:593
 msgid "Never"
 msgstr "Nigdy"
 
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:596
 msgid "Marginal"
 msgstr "Marginalne"
 
-#: src/gpgmetools.c:590
+#: src/gpgmetools.c:599
 msgid "Full"
 msgstr "PeÅ‚ne"
 
-#: src/gpgmetools.c:593
+#: src/gpgmetools.c:602
 msgid "Ultimate"
 msgstr "Nieograniczone"
 
-#: src/gpgmetools.c:619
+#: src/gpgmetools.c:628
 msgid "Incomplete"
 msgstr "NiepeÅ‚ne"
 
-#: src/gpgmetools.c:625
+#: src/gpgmetools.c:634
 msgid "Fully Valid"
 msgstr "W peÅ‚ni poprawny"
 
-#: src/gpgmetools.c:659
+#: src/gpgmetools.c:668
 msgid "Please enter the passphrase for the following key:"
 msgstr "ProszÄ™ podaÄ‡ hasÅ‚o dla nastÄ™pujÄ…cego klucza:"
 
-#: src/gpgmetools.c:667
+#: src/gpgmetools.c:676
 msgid "Wrong passphrase, please try again:"
 msgstr "NiewÅ‚aÅ›ciwe hasÅ‚o, proszÄ™ sprÃ³bowaÄ‡ ponownie:"
 
-#: src/gpgmetools.c:692
+#: src/gpgmetools.c:701
 msgid "Enter Passphrase"
 msgstr "WprowadÅº hasÅ‚o"
 
-#: src/gpgmetools.c:814
+#: src/gpgmetools.c:826
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:904 src/verifydlg.c:269
+#: src/gpgmetools.c:916 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[Nieznany identyfikator uÅ¼ytkownika]"
 
-#: src/gpgmetools.c:930 src/verifydlg.c:217
+#: src/gpgmetools.c:942 src/verifydlg.c:217
 msgid "Bad"
 msgstr "ZÅ‚y"
 
-#: src/gpgmetools.c:953
+#: src/gpgmetools.c:965
 msgid "Generic"
 msgstr "OgÃ³lne"
 
-#: src/gpgmetools.c:956
+#: src/gpgmetools.c:968
 msgid "Persona"
 msgstr "Nie sprawdzone"
 
-#: src/gpgmetools.c:959
+#: src/gpgmetools.c:971
 msgid "Casual"
 msgstr "PobieÅ¼ny"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:974
 msgid "Positive"
 msgstr "DokÅ‚adne"
 
-#: src/gpgmetools.c:980
+#: src/gpgmetools.c:992
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 "Ten klucz moÅ¼e byÄ‡ uÅ¼yty do wydawania certyfikatÃ³w, podpisywania i "
 "szyfrowania."
 
-#: src/gpgmetools.c:983
+#: src/gpgmetools.c:995
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "Ten klucz moÅ¼e byÄ‡ uÅ¼yty do wydawania certyfikatÃ³w i podpisywania, ale nie "
 "nadaje siÄ™ do szyfrowania danych."
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:1001
 msgid "The key can be used for certification and encryption."
 msgstr "Ten klucz moÅ¼e byÄ‡ uÅ¼yty do wydawania certyfikatÃ³w i szyfrowania."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:1004
 msgid "The key can be used only for certification."
 msgstr "Ten klucz moÅ¼e byÄ‡ uÅ¼yty tylko do certyfikatÃ³w."
 
-#: src/gpgmetools.c:1000
+#: src/gpgmetools.c:1012
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -1173,82 +913,71 @@
 "Ten klucz moÅ¼e byÄ‡ uÅ¼yty do podpisywania i szyfrowania, ale nie nadajÄ™ siÄ™ "
 "do wydawania certyfikatÃ³w."
 
-#: src/gpgmetools.c:1003
+#: src/gpgmetools.c:1015
 msgid "The key can be used only for signing."
 msgstr "Ten klucz moÅ¼e byÄ‡ uÅ¼yty tylko do podpisywania."
 
-#: src/gpgmetools.c:1008
+#: src/gpgmetools.c:1020
 msgid "The key can be used only for encryption."
 msgstr "Ten klucz moÅ¼e byÄ‡ uÅ¼yty tylko do szyfrowania."
 
-#: src/gpgmetools.c:1011
+#: src/gpgmetools.c:1023
 msgid "This key is useless."
 msgstr "Ten klucz jest bezuÅ¼yteczny."
 
-#: src/gtktools.c:320
+#: src/gtktools.c:48
 msgid "GPA Error"
 msgstr "BÅ‚Ä…d GPA"
 
-#: src/helpmenu.c:202
+#: src/helpmenu.c:83
 msgid "About GPA"
 msgstr "Informacje o GPA"
 
-#: src/helpmenu.c:247
-msgid "Brought to you by:"
-msgstr "UÅ¼ywasz tego programu dziÄ™ki:"
+#: src/helpmenu.c:89
+#, fuzzy
+msgid "GPA is the GNU Privacy Assistant."
+msgstr "GNU Privacy Assistant - MenedÅ¼er plikÃ³w "
 
-#: src/helpmenu.c:284
+#: src/icons.c:199
 #, fuzzy
-msgid "GPA is Free Software under the"
-msgstr "GPA jest programem rozprowadzanym na"
+msgid "_Verify"
+msgstr "Weryfikuj"
 
-#: src/helpmenu.c:288
-msgid "GNU General Public License."
-msgstr "Powszechniej Licencji Publicznej GNU."
+#: src/icons.c:200
+#, fuzzy
+msgid "_Encrypt"
+msgstr "Zaszyfruj"
 
-#: src/helpmenu.c:292
-msgid "For news see:"
-msgstr "Aktualne wiadomoÅ›ci znajdujÄ… siÄ™ na:"
+#: src/icons.c:201
+#, fuzzy
+msgid "_Decrypt"
+msgstr "Odszyfruj"
 
-#: src/helpmenu.c:297
+#: src/icons.c:202
 #, fuzzy
-msgid "http://www.gpg4win.org"
-msgstr "http://www.gnupg.org"
+msgid "_Brief"
+msgstr "ZwiÄ™zÅ‚y"
 
-#: src/helpmenu.c:299
-msgid "http://www.gnupg.org"
-msgstr "http://www.gnupg.org"
+#: src/icons.c:203
+#, fuzzy
+msgid "_Detailed"
+msgstr "SzczegÃ³Å‚owy"
 
-#: src/helpmenu.c:382
+#: src/icons.c:204
 #, fuzzy
-msgid "GNU General Public License"
-msgstr "Powszechniej Licencji Publicznej GNU."
+msgid "_Keyring Editor"
+msgstr "Edytor zbioru kluczy"
 
-#: src/helpmenu.c:409
+#: src/icons.c:205
 #, fuzzy
-msgid "_GNU General Public License"
-msgstr "Powszechniej Licencji Publicznej GNU."
+msgid "_Clipboard"
+msgstr "/Okna/MenadÅ¼er _plikÃ³w"
 
-#: src/helpmenu.c:436
-msgid "Show Help Text\n"
-msgstr "PokaÅ¼ tekst pomocy\n"
+#: src/icons.c:206
+#, fuzzy
+msgid "_File Manager"
+msgstr "menedÅ¼er plikÃ³w"
 
-#: src/helpmenu.c:444
-msgid "/_Help"
-msgstr "/_Pomoc"
-
-#: src/helpmenu.c:446
-msgid "/Help/_Contents"
-msgstr "/Pomoc/_ZawartoÅ›Ä‡"
-
-#: src/helpmenu.c:449
-msgid "/Help/_License"
-msgstr "/Pomoc/_Licencja"
-
-#: src/helpmenu.c:450
-msgid "/Help/_About"
-msgstr "/Pomoc/O _programie"
-
 #: src/keydeletedlg.c:41
 msgid "Removing Secret Key"
 msgstr "Usuwanie tajnego klucza"
@@ -1296,23 +1025,27 @@
 msgid "Are you sure you want to delete this key?"
 msgstr "JesteÅ› pewna/pewien Å¼e chcesz usunÄ…Ä‡ ten klucz?"
 
-#: src/keyeditdlg.c:149
+#: src/keyeditdlg.c:147
 msgid "Edit Key"
 msgstr "Edycja klucza"
 
-#: src/keyeditdlg.c:165
+#: src/keyeditdlg.c:162
 msgid "Change _passphrase"
 msgstr "ZmieÅ„ _hasÅ‚o"
 
-#: src/keyeditdlg.c:185
+#: src/keyeditdlg.c:182
 msgid "Change _expiration"
 msgstr "ZmieÅ„ datÄ™ utraty _waÅ¼noÅ›ci"
 
-#: src/keygendlg.c:58
+#: src/keygendlg.c:67
+msgid "You must enter a key size."
+msgstr ""
+
+#: src/keygendlg.c:72
 msgid "You must enter a User ID."
 msgstr ""
 
-#: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
+#: src/keygendlg.c:77 src/passwddlg.c:45
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -1320,7 +1053,7 @@
 "W polu \"HasÅ‚o\" i \"PowtÃ³rz hasÅ‚o\",\n"
 "naleÅ¼y wpisaÄ‡ te same dane."
 
-#: src/keygendlg.c:70 src/keygenwizard.c:314 src/passwddlg.c:52
+#: src/keygendlg.c:84 src/passwddlg.c:52
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1328,7 +1061,7 @@
 "Nie podano hasÅ‚a.\n"
 "Jest ono niezbÄ™dna do zabezpieczenia twojego klucza prywatnego."
 
-#: src/keygendlg.c:83 src/keygenwizard.c:328 src/passwddlg.c:65
+#: src/keygendlg.c:97 src/passwddlg.c:65
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1340,23 +1073,25 @@
 "\n"
 "ProszÄ™ wprowadziÄ‡ nowe hasÅ‚o."
 
-#: src/keygendlg.c:88 src/keygenwizard.c:333 src/passwddlg.c:70
+#: src/keygendlg.c:102 src/passwddlg.c:70
 msgid "_Enter new passphrase"
 msgstr "_WprowadÅº nowe hasÅ‚o"
 
-#: src/keygendlg.c:89 src/keygenwizard.c:334 src/passwddlg.c:71
+#: src/keygendlg.c:104 src/passwddlg.c:71
 msgid "Take this one _anyway"
 msgstr "Mimo wszystko uÅ¼yj _tego"
 
-#: src/keygendlg.c:144 src/keygenwizard.c:541
+#: src/keygendlg.c:150 src/keygenwizard.c:571 src/keygenwizard.c:584
+#: src/keygenwizard.c:594 src/keygenwizard.c:604 src/keygenwizard.c:616
+#: src/keygenwizard.c:633 src/keygenwizard.c:645
 msgid "Generate key"
 msgstr "Wygeneruj klucz"
 
-#: src/keygendlg.c:185
+#: src/keygendlg.c:177
 msgid "_Algorithm: "
 msgstr "_Algorytm: "
 
-#: src/keygendlg.c:197
+#: src/keygendlg.c:192
 msgid "_Key size (bits): "
 msgstr "_Rozmiar klucza (bity): "
 
@@ -1372,27 +1107,27 @@
 msgid "2048"
 msgstr "2048"
 
-#: src/keygendlg.c:216
+#: src/keygendlg.c:206
 msgid "_User ID: "
 msgstr "Identyfikator _uÅ¼ytkownika: "
 
-#: src/keygendlg.c:226
+#: src/keygendlg.c:217
 msgid "_Email: "
 msgstr "_Email: "
 
-#: src/keygendlg.c:236
+#: src/keygendlg.c:226
 msgid "_Comment: "
 msgstr "_Komentarz: "
 
-#: src/keygendlg.c:248
+#: src/keygendlg.c:235
 msgid "_Passphrase: "
 msgstr "_HasÅ‚o: "
 
-#: src/keygendlg.c:260
+#: src/keygendlg.c:246
 msgid "_Repeat passphrase: "
 msgstr "_Potwierdzenie hasÅ‚a: "
 
-#: src/keygenwizard.c:152
+#: src/keygenwizard.c:172
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1404,19 +1139,16 @@
 "Twoje dane personalne bÄ™dÄ… czÄ™Å›ciÄ… nowego klucza, dziÄ™ki czemu Å‚atwiej "
 "bÄ™dzie innym osobom identyfikowaÄ‡ do kogo naleÅ¼y dany klucz."
 
-#: src/keygenwizard.c:157
+#: src/keygenwizard.c:175
 msgid "Your Name:"
 msgstr "Twoje imiÄ™ i nazwisko:"
 
-#: src/keygenwizard.c:170
-msgid "Please insert your name"
-msgstr "ProszÄ™ podaÄ‡ swoje imiÄ™ i nazwisko"
-
-#: src/keygenwizard.c:183
+#: src/keygenwizard.c:211
+#, fuzzy
 msgid ""
 "Please insert your email address.\n"
 "\n"
-" Your email address will be part of the new key to make it easier for others "
+"Your email address will be part of the new key to make it easier for others "
 "to identify keys. If you have several email addresses, you can add further "
 "email adresses later."
 msgstr ""
@@ -1426,27 +1158,40 @@
 "innym osobom identyfikowaÄ‡ do kogo naleÅ¼y dany klucz. JeÅ¼eli posiadasz kilka "
 "adresÃ³w email, to bÄ™dzie moÅ¼na dodaÄ‡ je pÃ³Åºniej."
 
-#: src/keygenwizard.c:190
+#: src/keygenwizard.c:215
 msgid "Your Email Address:"
 msgstr "TwÃ³j adres email:"
 
-#: src/keygenwizard.c:205
-msgid "Please insert your email address"
-msgstr "ProszÄ™ wprowadziÄ‡ swÃ³j adres email"
-
-#: src/keygenwizard.c:239
+#: src/keygenwizard.c:319
 msgid "Please choose a passphrase for the new key."
 msgstr "ProszÄ™ wybraÄ‡ hasÅ‚o dla nowo utworzonego klucza."
 
-#: src/keygenwizard.c:248 src/passwddlg.c:108
+#: src/keygenwizard.c:326
+#, fuzzy
+msgid ""
+"In \"Passphrase\" and \"Repeat passphrase\", you must enter the same "
+"passphrase."
+msgstr ""
+"W polu \"HasÅ‚o\" i \"PowtÃ³rz hasÅ‚o\",\n"
+"naleÅ¼y wpisaÄ‡ te same dane."
+
+#: src/keygenwizard.c:335
+msgid "Warning: The passphrase you have entered is not very secure."
+msgstr ""
+
+#: src/keygenwizard.c:350
+msgid "Quality: "
+msgstr ""
+
+#: src/keygenwizard.c:358 src/passwddlg.c:111
 msgid "Passphrase: "
 msgstr "HasÅ‚o: "
 
-#: src/keygenwizard.c:261 src/passwddlg.c:117
+#: src/keygenwizard.c:370 src/passwddlg.c:120
 msgid "Repeat Passphrase: "
 msgstr "PowtÃ³rz hasÅ‚o: "
 
-#: src/keygenwizard.c:358
+#: src/keygenwizard.c:412
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1456,15 +1201,15 @@
 "Zaleca siÄ™ utworzenie kopii zapasowej klucza, zaraz po jego utworzeniu.\n"
 "Chcesz utworzyÄ‡ kopiÄ™ zapasowÄ…?"
 
-#: src/keygenwizard.c:367
+#: src/keygenwizard.c:420
 msgid "Create _backup copy"
 msgstr "UtwÃ³rz kopiÄ™ _zapasowÄ…"
 
-#: src/keygenwizard.c:374 src/keyring.c:739 src/keyring.c:767
+#: src/keygenwizard.c:425 src/keyring.c:737 src/keyring.c:763
 msgid "Do it _later"
 msgstr "ZrÃ³b to _pÃ³Åºniej"
 
-#: src/keygenwizard.c:402
+#: src/keygenwizard.c:454
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1475,7 +1220,7 @@
 "Nawet na szybkich komputerach moÅ¼e, to trochÄ™ potrwaÄ‡. Prosimy zachowaÄ‡ "
 "cierpliwoÅ›Ä‡."
 
-#: src/keygenwizard.c:411
+#: src/keygenwizard.c:463
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1495,44 +1240,44 @@
 "GnuPG przebudowuje bazÄ™ danych zaufania.\n"
 "MoÅ¼e to zajÄ…Ä‡ klika sekund."
 
-#: src/keylist.c:559
+#: src/keylist.c:547
 msgid ""
 "This columns lists the type of the certificate.  A 'P' denotes OpenPGP and a "
 "'X' denotes X.509 (S/MIME)."
 msgstr ""
 
-#: src/keylist.c:568
+#: src/keylist.c:556
 #, fuzzy
 msgid "The key ID is a short number to identify a certificate."
 msgstr "Ten klucz moÅ¼e byÄ‡ uÅ¼yty tylko do certyfikatÃ³w."
 
-#: src/keylist.c:581
+#: src/keylist.c:569
 msgid "The Expiry Date is the date until the certificate is valid."
 msgstr ""
 
-#: src/keylist.c:591 src/ownertrustdlg.c:122
+#: src/keylist.c:579 src/ownertrustdlg.c:123
 msgid "Owner Trust"
 msgstr "Zaufanie do wÅ‚aÅ›ciciela"
 
-#: src/keylist.c:592
+#: src/keylist.c:580
 msgid ""
 "The Owner Trust has been set by you and describes how far you trust the "
 "holder of the certificate to correctly sign (certify) other certificates.  "
 "It is only meaningful for OpenPGP."
 msgstr ""
 
-#: src/keylist.c:604
+#: src/keylist.c:592
 #, fuzzy
 msgid "Validity"
 msgstr "PoprawnoÅ›Ä‡ klucza"
 
-#: src/keylist.c:605
+#: src/keylist.c:593
 msgid ""
 "The Validity describes the trust level the system has in this certificate.  "
 "That is how sure it is that the named user is actually that user."
 msgstr ""
 
-#: src/keylist.c:619
+#: src/keylist.c:607
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
@@ -1542,7 +1287,7 @@
 msgid "No keys selected for signing."
 msgstr "Nie wybrano kluczy do podpisu."
 
-#: src/keyring.c:734
+#: src/keyring.c:732
 msgid ""
 "You do not have a private key yet. Do you want to generate one now "
 "(recommended) or do it later?"
@@ -1550,11 +1295,11 @@
 "Nie posiadasz jeszcze klucza prywatnego. WygenerowaÄ‡ taki klucz teraz "
 "(zalecane), czy uczyniÄ‡ to pÃ³Åºniej?"
 
-#: src/keyring.c:738
+#: src/keyring.c:736
 msgid "_Generate key now"
 msgstr "_Wygeneruj klucz teraz"
 
-#: src/keyring.c:761
+#: src/keyring.c:757
 msgid ""
 "You do not have a backup copy of your private key yet. Do you want to backup "
 "your key now (recommended) or do it later?"
@@ -1562,337 +1307,245 @@
 "Nie posiadasz kopii zapasowej swojego klucza prywatnego. SporzÄ…dziÄ‡ kopiÄ™ "
 "zapasowÄ… klucza teraz (zalecane), czy uczyniÄ‡ to pÃ³Åºniej? "
 
-#: src/keyring.c:766
+#: src/keyring.c:762
 msgid "_Backup key now"
 msgstr "_SporzÄ…dÅº kopiÄ™ zapasowÄ… teraz"
 
-#: src/keyring.c:883
-msgid "/_Keys"
+#: src/keyring.c:886
+#, fuzzy
+msgid "_Keys"
 msgstr "/_Klucze"
 
-#: src/keyring.c:884
-msgid "/Keys/_Refresh"
-msgstr "/Klucze/_OdÅ›wieÅ¼"
-
-#: src/keyring.c:886
-msgid "/Keys/sep0"
-msgstr "/Klucze/sep0"
-
 #: src/keyring.c:887
-msgid "/Keys/_New Key..."
-msgstr "/Klucze/_Nowy Klucz..."
+#, fuzzy
+msgid "_Server"
+msgstr "/_Serwer"
 
-#: src/keyring.c:889
-msgid "/Keys/_Delete Keys..."
-msgstr "/Klucze/_UsuÅ„ Klucze..."
+#: src/keyring.c:901
+msgid "Select all certificates"
+msgstr ""
 
-#: src/keyring.c:891
-msgid "/Keys/sep1"
-msgstr "/Klucze/sep1"
+#: src/keyring.c:906
+msgid "Refresh the keyring"
+msgstr "OdÅ›wieÅ¼a zbiÃ³r kluczy"
 
-#: src/keyring.c:892
-msgid "/Keys/_Sign Keys..."
-msgstr "/Klucze/_Podpisz klucze..."
+#: src/keyring.c:907
+#, fuzzy
+msgid "_New key..."
+msgstr "/Klucze/_Nowy Klucz..."
 
-#: src/keyring.c:893
-msgid "/Keys/Set _Owner Trust..."
-msgstr "/Klucze/Ustawienie wartoÅ›ci zaufania do wÅ‚aÅ›ciciela..."
+#: src/keyring.c:908
+#, fuzzy
+msgid "Generate a new key"
+msgstr "Wygeneruj klucz"
 
-#: src/keyring.c:894
-msgid "/Keys/_Edit Private Key..."
-msgstr "/Klucze/_Edytuj klucz prywatny..."
+#: src/keyring.c:909
+#, fuzzy
+msgid "_Delete keys"
+msgstr "/_UsuÅ„ klucze..."
 
-#: src/keyring.c:895
-msgid "/Keys/sep2"
-msgstr "/Klucze/sep2"
+#: src/keyring.c:910
+msgid "Remove the selected key"
+msgstr "Usuwa wybrany klucz"
 
-#: src/keyring.c:896
-msgid "/Keys/_Import Keys..."
-msgstr "/Klucze/_Importuj klucze..."
+#: src/keyring.c:911
+#, fuzzy
+msgid "_Sign Keys..."
+msgstr "/_Podpisz klucze..."
 
-#: src/keyring.c:897
-msgid "/Keys/E_xport Keys..."
-msgstr "/Klucze/E_ksportuj klucze..."
+#: src/keyring.c:912
+msgid "Sign the selected key"
+msgstr "Podpisuje wybrany klucz"
 
-#: src/keyring.c:898
-msgid "/Keys/_Backup..."
-msgstr "/Klucze/Kopia zapa_sowa..."
+#: src/keyring.c:913
+#, fuzzy
+msgid "Set _Owner Trust..."
+msgstr "/Ustaw poziom zaufania do wÅ‚aÅ›ciciela..."
 
-#: src/keyring.c:901
-msgid "/_Server"
-msgstr "/_Serwer"
+#: src/keyring.c:914
+#, fuzzy
+msgid "Set owner trust of the selected key"
+msgstr "Usuwa wybrany klucz"
 
-#: src/keyring.c:902
-msgid "/Server/_Retrieve Keys..."
-msgstr "/Serwer/_Pobierz klucze..."
+#: src/keyring.c:916
+#, fuzzy
+msgid "_Edit Private Key..."
+msgstr "/_Edytuj klucz prywatny..."
 
-#: src/keyring.c:903
-msgid "/Server/_Send Keys..."
-msgstr "/Serwer/_WyÅ›lij klucze..."
+#: src/keyring.c:917
+msgid "Edit the selected private key"
+msgstr "Edytuje wybrany klucz prywatny"
 
-#: src/keyring.c:908
+#: src/keyring.c:919
 #, fuzzy
-msgid "/Windows/_File Manager"
-msgstr "/Okna/MenadÅ¼er _plikÃ³w"
+msgid "_Import Keys..."
+msgstr "Importuje klucze"
 
-#: src/keyring.c:939
-msgid "/Keys/Export Keys..."
-msgstr "/Klucze/Eksportuj klucze..."
+#: src/keyring.c:920
+msgid "Import Keys"
+msgstr "Importuje klucze"
 
-#: src/keyring.c:944
-msgid "/Keys/Delete Keys..."
-msgstr "/Klucze/UsuÅ„ klucze..."
+#: src/keyring.c:921
+#, fuzzy
+msgid "E_xport Keys..."
+msgstr "/E_ksportuj klucze..."
 
-#: src/keyring.c:952
-msgid "/Server/Send Keys..."
-msgstr "/Serwer/WyÅ›lij klucze..."
+#: src/keyring.c:922
+msgid "Export Keys"
+msgstr "Eksportuje klucze"
 
-#: src/keyring.c:959
-msgid "/Keys/Set Owner Trust..."
-msgstr "/Klucze/Ustaw poziom zaufania do wÅ‚aÅ›ciciela..."
+#: src/keyring.c:923
+#, fuzzy
+msgid "_Backup..."
+msgstr "/_Kopia zapasowa..."
 
-#: src/keyring.c:966
-msgid "/Keys/Sign Keys..."
-msgstr "/Klucze/Podpisz klucze..."
+#: src/keyring.c:924
+#, fuzzy
+msgid "Backup key"
+msgstr "Kopia zaspasowa kluczy"
 
-#: src/keyring.c:972
-msgid "/Keys/Edit Private Key..."
-msgstr "/Klucze/Edytuj klucz prywatny..."
+#: src/keyring.c:927
+#, fuzzy
+msgid "_Retrieve Keys..."
+msgstr "/Serwer/_Pobierz klucze..."
 
-#: src/keyring.c:977
-msgid "/Keys/Backup..."
-msgstr "/Klucze/Kopia zapasowa..."
+#: src/keyring.c:928
+msgid "Retrieve keys from server"
+msgstr ""
 
-#: src/keyring.c:994
-msgid "/_Copy"
-msgstr "/_Kopiuj"
-
-#: src/keyring.c:996
-msgid "/_Paste"
-msgstr "/_Wklej"
-
-#: src/keyring.c:998
-msgid "/_Delete Keys..."
-msgstr "/_UsuÅ„ klucze..."
-
-#: src/keyring.c:1001
-msgid "/_Sign Keys..."
+#: src/keyring.c:930
+#, fuzzy
+msgid "_Send Keys..."
 msgstr "/_Podpisz klucze..."
 
-#: src/keyring.c:1002
-msgid "/Set _Owner Trust..."
-msgstr "/Ustaw poziom zaufania do wÅ‚aÅ›ciciela..."
+#: src/keyring.c:931
+#, fuzzy
+msgid "Send keys to server"
+msgstr "/W_yÅ›lij klucze na serwer..."
 
-#: src/keyring.c:1003
-msgid "/_Edit Private Key..."
-msgstr "/_Edytuj klucz prywatny..."
+#: src/keyring.c:937
+msgid "Show Brief Keylist"
+msgstr "Pokazuje zwiÄ™zÅ‚Ä… listÄ™ kluczy"
 
-#: src/keyring.c:1005
-msgid "/E_xport Keys..."
-msgstr "/E_ksportuj klucze..."
+#: src/keyring.c:939
+msgid "Show Key Details"
+msgstr "Pokazuje szczegÃ³Å‚owÄ… listÄ™ kluczy"
 
-#: src/keyring.c:1006
-msgid "/Se_nd Keys to Server..."
-msgstr "/W_yÅ›lij klucze na serwer..."
+#: src/keyring.c:1063
+msgid "Edit"
+msgstr "Edycja"
 
-#: src/keyring.c:1007
-msgid "/_Backup..."
-msgstr "/_Kopia zapasowa..."
+#: src/keyring.c:1065
+#, fuzzy
+msgid "Delete"
+msgstr "/Edycja/Wybierz _wszystko"
 
-#: src/keyring.c:1018
-msgid "/Set Owner Trust..."
-msgstr "/Ustaw poziom zaufania do wÅ‚aÅ›ciciela..."
+#: src/keyring.c:1067
+msgid "Sign"
+msgstr "Podpisz"
 
-#: src/keyring.c:1025
-msgid "/Sign Keys..."
-msgstr "/Podpisz klucze..."
+#: src/keyring.c:1069
+msgid "Export"
+msgstr "Eksport"
 
-#: src/keyring.c:1031
-msgid "/Edit Private Key..."
-msgstr "/Edytuj prywatny klucz..."
+#: src/keyring.c:1071
+msgid "Import"
+msgstr "Import"
 
-#: src/keyring.c:1036
-msgid "/Backup..."
-msgstr "/Kopia zapasowa..."
-
-#: src/keyring.c:1106
+#: src/keyring.c:1178
 msgid "Subkeys"
 msgstr "Podklucze"
 
-#: src/keyring.c:1180 src/keysigndlg.c:110
+#: src/keyring.c:1252 src/keysigndlg.c:106
 msgid "Fingerprint:"
 msgstr "Odcisk klucza:"
 
-#: src/keyring.c:1182
+#: src/keyring.c:1254
 msgid "Expires at:"
 msgstr "Traci waÅ¼noÅ›Ä‡:"
 
-#: src/keyring.c:1184
+#: src/keyring.c:1256
 msgid "Owner Trust:"
 msgstr "Zaufanie do wÅ‚aÅ›ciciela:"
 
-#: src/keyring.c:1186
+#: src/keyring.c:1258
 msgid "Key Validity:"
 msgstr "PoprawnoÅ›Ä‡ klucza:"
 
-#: src/keyring.c:1188
+#: src/keyring.c:1260
 msgid "Key Type:"
 msgstr "Rodzaj klucza:"
 
-#: src/keyring.c:1190
+#: src/keyring.c:1262
 msgid "Created at:"
 msgstr "Utworzony dnia:"
 
-#: src/keyring.c:1193
+#: src/keyring.c:1265
 msgid "Details"
 msgstr "SzczegÃ³Å‚y"
 
-#: src/keyring.c:1201
+#: src/keyring.c:1273
 msgid "Show signatures on user name:"
 msgstr "PokaÅ¼ podpisy danego uÅ¼ytkownika:"
 
-#: src/keyring.c:1225
+#: src/keyring.c:1298
 msgid "Signatures"
 msgstr "Podpisy"
 
-#: src/keyring.c:1249
+#: src/keyring.c:1322
 msgid "The key has both a private and a public part"
 msgstr "Klucz posiada zarÃ³wno czeÅ›Ä‡ publicznÄ… jak i prywatnÄ…"
 
-#: src/keyring.c:1252
+#: src/keyring.c:1325
 msgid "The key has only a public part"
 msgstr "Klucz posiada tylko czÄ™Å›Ä‡ publicznÄ…"
 
-#: src/keyring.c:1287
+#: src/keyring.c:1360
 #, c-format
 msgid "%s %u bits"
 msgstr "%s %u bit"
 
-#: src/keyring.c:1312
+#: src/keyring.c:1385
 msgid "No keys selected"
 msgstr "Nie wybrano Å¼adnego klucza"
 
-#: src/keyring.c:1315
+#: src/keyring.c:1388
 #, fuzzy, c-format
 msgid "%d key selected"
 msgid_plural "%d keys selected"
 msgstr[0] "wybranych kluczy - %d"
 msgstr[1] "wybranych kluczy - %d"
 
-#: src/keyring.c:1347
+#: src/keyring.c:1423
 msgid "All signatures"
 msgstr "Wszystkie podpisy"
 
-#: src/keyring.c:1552
-msgid "Edit"
-msgstr "Edycja"
-
-#: src/keyring.c:1553
-msgid "Edit the selected private key"
-msgstr "Edytuje wybrany klucz prywatny"
-
-#: src/keyring.c:1554
-msgid "edit key"
-msgstr "edycja klucza"
-
-#: src/keyring.c:1562
-msgid "Remove the selected key"
-msgstr "Usuwa wybrany klucz"
-
-#: src/keyring.c:1563
-msgid "remove key"
-msgstr "usuwa klucz"
-
-#: src/keyring.c:1571
-msgid "Sign the selected key"
-msgstr "Podpisuje wybrany klucz"
-
-#: src/keyring.c:1571
-msgid "sign key"
-msgstr "podpisuje klucz"
-
 #: src/keyring.c:1578
-msgid "Import"
-msgstr "Import"
-
-#: src/keyring.c:1579
-msgid "Import Keys"
-msgstr "Importuje klucze"
-
-#: src/keyring.c:1579
-msgid "import keys"
-msgstr "importuj klucze"
-
-#: src/keyring.c:1584
-msgid "Export"
-msgstr "Eksport"
-
-#: src/keyring.c:1585
-msgid "Export Keys"
-msgstr "Eksportuje klucze"
-
-#: src/keyring.c:1585
-msgid "export keys"
-msgstr "eksport kluczy"
-
-#: src/keyring.c:1598
-msgid "Brief"
-msgstr "ZwiÄ™zÅ‚y"
-
-#: src/keyring.c:1598
-msgid "Show Brief Keylist"
-msgstr "Pokazuje zwiÄ™zÅ‚Ä… listÄ™ kluczy"
-
-#: src/keyring.c:1599
-msgid "brief"
-msgstr "zwiÄ™zÅ‚y"
-
-#: src/keyring.c:1610
-msgid "Detailed"
-msgstr "SzczegÃ³Å‚owy"
-
-#: src/keyring.c:1610
-msgid "Show Key Details"
-msgstr "Pokazuje szczegÃ³Å‚owÄ… listÄ™ kluczy"
-
-#: src/keyring.c:1611
-msgid "detailed"
-msgstr "szczegÃ³Å‚owy"
-
-#: src/keyring.c:1639
-msgid "Refresh the keyring"
-msgstr "OdÅ›wieÅ¼a zbiÃ³r kluczy"
-
-#: src/keyring.c:1640
-msgid "refresh keyring"
-msgstr "odÅ›wieÅ¼a zbiÃ³r kluczy"
-
-#: src/keyring.c:1711
 #, fuzzy
 msgid "Selected default key:"
 msgstr "Wybrano domyÅ›lny klucz"
 
-#: src/keyring.c:1721
+#: src/keyring.c:1588
 msgid "No default key selected in the preferences."
 msgstr ""
 
-#: src/keyring.c:1833
+#: src/keyring.c:1701
 msgid "GNU Privacy Assistant - Keyring Editor"
 msgstr "GNU Privacy Assistant - Edytor zbioru kluczy"
 
-#: src/keyring.c:1865
+#: src/keyring.c:1728
 msgid "Keyring Editor"
 msgstr "Edytor zbioru kluczy"
 
-#: src/keysigndlg.c:60
+#: src/keysigndlg.c:59
 msgid "Sign Key"
 msgstr "Podpisz klucz"
 
-#: src/keysigndlg.c:76
+#: src/keysigndlg.c:72
 msgid "Do you want to sign the following key?"
 msgstr "Czy chcesz podpisaÄ‡ nas"
 
-#: src/keysigndlg.c:120
+#: src/keysigndlg.c:116
 msgid ""
 "Check the name and fingerprint carefully to be sure that it really is the "
 "key you want to sign."
@@ -1900,20 +1553,20 @@
 "DokÅ‚adnie sprawdÅº nazwÄ™ i odcisk klucza, aby mieÄ‡ pewnoÅ›Ä‡, Å¼e zamierzasz "
 "podpisaÄ‡ wÅ‚aÅ›ciwy klucz."
 
-#: src/keysigndlg.c:128
+#: src/keysigndlg.c:124
 msgid "All user names in this key will be signed."
 msgstr "Wszyscy uÅ¼ytkownicy przypisani do tego klucza zostanÄ… podpisani."
 
-#: src/keysigndlg.c:134
+#: src/keysigndlg.c:130
 msgid "The key will be signed with your default private key."
 msgstr ""
 "Klucz zostanie podpisany za pomocÄ… twojego domyÅ›lnego klucza prywatnego."
 
-#: src/keysigndlg.c:141
+#: src/keysigndlg.c:137
 msgid "Sign only _locally"
 msgstr "Podpisz tylko _lokalnie"
 
-#: src/options.c:316
+#: src/options.c:323
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -1921,26 +1574,26 @@
 "Wybrany przez Ciebie prywatny klucz nie jest juÅ¼ dostÄ™pny\n"
 "GPA sprÃ³buje automatycznie wybraÄ‡ nowy, domyÅ›lny klucz."
 
-#: src/ownertrustdlg.c:106
+#: src/ownertrustdlg.c:107
 msgid "Change key ownertrust"
 msgstr "Zmiana poziomu zaufania do wÅ‚aÅ›ciciela"
 
-#: src/ownertrustdlg.c:130
+#: src/ownertrustdlg.c:131
 msgid "_Unknown"
 msgstr "_Nieznany"
 
-#: src/ownertrustdlg.c:135
+#: src/ownertrustdlg.c:136
 msgid ""
 "You don't know how much to trust this user to verify other people's keys.\n"
 msgstr ""
 "Trudno jest ci okreÅ›liÄ‡ jak bardzo ufaÄ‡ temu uÅ¼ytkownikowi w sprawie "
 "weryfikacji kluczy innych osÃ³b.\n"
 
-#: src/ownertrustdlg.c:145
+#: src/ownertrustdlg.c:146
 msgid "_Never"
 msgstr "_Nigdy"
 
-#: src/ownertrustdlg.c:150
+#: src/ownertrustdlg.c:151
 msgid ""
 "You don't trust this user at all to verify the validity of other people's "
 "keys at all.\n"
@@ -1948,11 +1601,11 @@
 "CaÅ‚kowicie nie wierzysz, Å¼e ten uÅ¼ytkownik potrafi weryfikowaÄ‡ i sprawdzaÄ‡ "
 "waÅ¼noÅ›Ä‡ kluczy innych osÃ³b.\n"
 
-#: src/ownertrustdlg.c:160
+#: src/ownertrustdlg.c:161
 msgid "_Marginal"
 msgstr "_Marginalne"
 
-#: src/ownertrustdlg.c:165
+#: src/ownertrustdlg.c:166
 msgid ""
 "You don't trust this user's ability to verify the validity of other people's "
 "keys enough to consider keys valid based on his/her sole word.\n"
@@ -1966,11 +1619,11 @@
 "jeÅ¼eli zostanie podpisany przez conajmniej dwÃ³ch innych uÅ¼ytkownikÃ³w o "
 "marginalnym zaufaniu z poprawnymi kluczami\n"
 
-#: src/ownertrustdlg.c:182
+#: src/ownertrustdlg.c:183
 msgid "_Full"
 msgstr "_PeÅ‚ne"
 
-#: src/ownertrustdlg.c:187
+#: src/ownertrustdlg.c:188
 msgid ""
 "You trust this user's ability to verify the validity of other people's keys "
 "so much, that you'll consider valid any key signed by him/her, provided this "
@@ -1980,11 +1633,11 @@
 "sprawdzaniem poprawnoÅ›ci kluczy. OkreÅ›lenie peÅ‚nego zaufania sprawi, Å¼e "
 "kaÅ¼dy klucz podpisany przez tego uÅ¼ytkownika bÄ™dzie uznawany za poprawny.\n"
 
-#: src/ownertrustdlg.c:200
+#: src/ownertrustdlg.c:201
 msgid "U_ltimate"
 msgstr "_Nieograniczone"
 
-#: src/ownertrustdlg.c:205
+#: src/ownertrustdlg.c:206
 msgid ""
 "You consider this key valid, and trust the user so much that you will "
 "consider any key signed by him/her fully valid.\n"
@@ -2075,37 +1728,147 @@
 "Nie ma dostÄ™pnej wtyczki dla wybranego protokoÅ‚u\n"
 "obsÅ‚ugujÄ…cego serwer kluczy."
 
-#: src/server_access.c:528 src/server_access.c:574
+#: src/server_access.c:528 src/server_access.c:572
 msgid "The keyserver you specified is not valid"
 msgstr "Podany serwer kluczy nie jest poprawny."
 
-#: src/settingsdlg.c:59
+#: src/settingsdlg.c:133 src/siglist.c:135
+msgid "Local"
+msgstr "Lokalny"
+
+#: src/settingsdlg.c:134
+msgid "Local, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:135
 #, fuzzy
+msgid "Local, PKA"
+msgstr "Lokalny"
+
+#: src/settingsdlg.c:136
+msgid "Local, PKA, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:137
+msgid "Local, Keyserver, PKA"
+msgstr ""
+
+#: src/settingsdlg.c:138
+#, fuzzy
+msgid "Local, kDNS"
+msgstr "Lokalny"
+
+#: src/settingsdlg.c:139
+msgid "Local, kDNS, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:140
+msgid "PKA"
+msgstr ""
+
+#: src/settingsdlg.c:141
+msgid "kDNS"
+msgstr ""
+
+#: src/settingsdlg.c:142
+msgid "Custom"
+msgstr ""
+
+#: src/settingsdlg.c:208
+#, fuzzy
+msgid "<b>User interface</b>"
+msgstr "UÅ¼yj trybu zaawansowanego:"
+
+#: src/settingsdlg.c:215
+#, fuzzy
+msgid "Use _advanced mode"
+msgstr "UÅ¼yj trybu zaawansowanego:"
+
+#: src/settingsdlg.c:221
+msgid "Show advanced _options"
+msgstr ""
+
+#: src/settingsdlg.c:272
+msgid ""
+"No default key has been selected.  This may lead to problems when signing or "
+"encrypting.  For example you might later not be able to read a mail written "
+"by you and encrypted to someone else.\n"
+"\n"
+"Please consider creating your own key and select it then."
+msgstr ""
+
+#: src/settingsdlg.c:278
+msgid "Continue without a default key"
+msgstr ""
+
+#: src/settingsdlg.c:280
+#, fuzzy
+msgid "Let me select a default key"
+msgstr "Wybrano domyÅ›lny klucz"
+
+#: src/settingsdlg.c:305
+#, fuzzy
 msgid "<b>Default _key</b>"
 msgstr "_DomyÅ›lny klucz:"
 
-#: src/settingsdlg.c:111
+#: src/settingsdlg.c:405
 #, fuzzy
 msgid "<b>Default key_server</b>"
 msgstr "DomyÅ›lny _serwer kluczy: "
 
-#: src/settingsdlg.c:158
+#: src/settingsdlg.c:602
 #, fuzzy
-msgid "<b>Use _advanced mode</b>"
-msgstr "UÅ¼yj trybu zaawansowanego:"
+msgid "<b>Auto key _locate</b>"
+msgstr "DomyÅ›lny _serwer kluczy: "
 
-#: src/settingsdlg.c:193
-msgid "Settings"
-msgstr "Ustawienia"
+#: src/settingsdlg.c:612
+msgid ""
+"The list of methods to locate keys via an email address.\n"
+"All given methods are used in turn until a matching key is found.  The "
+"supported methods are:\n"
+" Local\n"
+"   - Use the local keyring.\n"
+" Keyserver\n"
+"   - Use the default keyserver.\n"
+" PKA\n"
+"   - Use the Public Key Association.\n"
+" kDNS\n"
+"   - Use kDNS with the nameserver below.\n"
+" Custom\n"
+"   - Configured in the backend dialog.\n"
+msgstr ""
 
+#: src/settingsdlg.c:627
+msgid "Method:"
+msgstr ""
+
+#: src/settingsdlg.c:644
+msgid "The IP address of the nameserver used for the kDNS method."
+msgstr ""
+
+#: src/settingsdlg.c:646
+#, fuzzy
+msgid "kDNS Server:"
+msgstr "/_Serwer"
+
+#: src/settingsdlg.c:740
+#, fuzzy
+msgid "The URL given for the keyserver is not valid."
+msgstr "Podany serwer kluczy nie jest poprawny."
+
+#: src/settingsdlg.c:749
+msgid "The data given for \"Auto key locate\" is not valid."
+msgstr ""
+
+#: src/settingsdlg.c:886
+#, fuzzy
+msgid "GNU Privacy Assistant - Settings"
+msgstr "GNU Privacy Assistant - Edytor zbioru kluczy"
+
 #: src/siglist.c:128
 msgid "Level"
 msgstr "Poziom"
 
-#: src/siglist.c:135
-msgid "Local"
-msgstr "Lokalny"
-
 #: src/verifydlg.c:116
 #, fuzzy
 msgid "Verify documents"
@@ -2133,6 +1896,349 @@
 msgid "Signatures:"
 msgstr "Podpisy:"
 
+#~ msgid "/File/C_lear"
+#~ msgstr "/Plik/Wy_czyÅ›Ä‡"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Plik/_OtwÃ³rz"
+
+#, fuzzy
+#~ msgid "/File/Save _As"
+#~ msgstr "/Plik/Z_amknij"
+
+#~ msgid "/File/sep1"
+#~ msgstr "/Plik/sep1"
+
+#~ msgid "/File/_Sign"
+#~ msgstr "/Plik/_Podpisz"
+
+#~ msgid "/File/_Verify"
+#~ msgstr "/Plik/_Weryfikuj"
+
+#~ msgid "/File/_Encrypt"
+#~ msgstr "/Plik/_Zaszyfruj"
+
+#~ msgid "/File/_Decrypt"
+#~ msgstr "/Plik/O_dszyfruj"
+
+#~ msgid "/File/sep2"
+#~ msgstr "/Plik/sep2"
+
+#~ msgid "/File/_Close"
+#~ msgstr "/Plik/Z_amknij"
+
+#~ msgid "/File/_Quit"
+#~ msgstr "/Plik/Za_koÅ„cz"
+
+#, fuzzy
+#~ msgid "/Edit/_Undo"
+#~ msgstr "/Edycja/_Kopiuj"
+
+#, fuzzy
+#~ msgid "/Edit/_Redo"
+#~ msgstr "/Edycja/_Kopiuj"
+
+#, fuzzy
+#~ msgid "/Edit/sep0"
+#~ msgstr "/Edycja/sep2"
+
+#, fuzzy
+#~ msgid "/Edit/Cut"
+#~ msgstr "/Edycja/Kopiuj"
+
+#~ msgid "/Edit/_Copy"
+#~ msgstr "/Edycja/_Kopiuj"
+
+#~ msgid "/Edit/_Paste"
+#~ msgstr "/Edycja/_Wklej"
+
+#, fuzzy
+#~ msgid "/Edit/_Delete"
+#~ msgstr "/Edycja/_Wklej"
+
+#~ msgid "/Edit/sep1"
+#~ msgstr "/Edycja/sep1"
+
+#~ msgid "/Edit/Select _All"
+#~ msgstr "/Edycja/Wybierz _wszystko"
+
+#~ msgid "/Edit/sep2"
+#~ msgstr "/Edycja/sep2"
+
+#~ msgid "/Edit/Pr_eferences..."
+#~ msgstr "/Edycja/_Ustawienia..."
+
+#, fuzzy
+#~ msgid "/Edit/_Backend Preferences..."
+#~ msgstr "/Edycja/_Ustawienia..."
+
+#~ msgid "/_Windows"
+#~ msgstr "/_Okna"
+
+#~ msgid "/Windows/_Keyring Editor"
+#~ msgstr "/Okna/Edytor zbioru _kluczy"
+
+#~ msgid "/Windows/_Filemanager"
+#~ msgstr "/Okna/MenadÅ¼er _plikÃ³w"
+
+#~ msgid "/Edit/Copy"
+#~ msgstr "/Edycja/Kopiuj"
+
+#, fuzzy
+#~ msgid "/Edit/Paste"
+#~ msgstr "/Edycja/_Wklej"
+
+#~ msgid "open file"
+#~ msgstr "otwÃ³rz plik"
+
+#, fuzzy
+#~ msgid "save file as"
+#~ msgstr "zamknij pliki"
+
+#, fuzzy
+#~ msgid "cut the selection"
+#~ msgstr "Szyfruje wybrany plik"
+
+#, fuzzy
+#~ msgid "copy the selection"
+#~ msgstr "Szyfruje wybrany plik"
+
+#, fuzzy
+#~ msgid "Sign the selected text"
+#~ msgstr "Podpisuje wybrany klucz"
+
+#, fuzzy
+#~ msgid "verify text"
+#~ msgstr "weryfikuj plik"
+
+#, fuzzy
+#~ msgid "encrypt text"
+#~ msgstr "zaszyfruj plik"
+
+#, fuzzy
+#~ msgid "decrypt text"
+#~ msgstr "odszyfruj plik"
+
+#~ msgid "preferences"
+#~ msgstr "ustawienia"
+
+#, fuzzy
+#~ msgid "Open the keyring editor"
+#~ msgstr "otwiera edytor zbioru kluczy (domyÅ›lne)"
+
+#, fuzzy
+#~ msgid "keyring editor"
+#~ msgstr "Edytor zbioru kluczy"
+
+#, fuzzy
+#~ msgid "Open the file manager"
+#~ msgstr "Otwiera okno menedÅ¼era plikÃ³w"
+
+#~ msgid "file manager"
+#~ msgstr "menedÅ¼er plikÃ³w"
+
+#~ msgid "Help"
+#~ msgstr "Pomoc"
+
+#~ msgid "help"
+#~ msgstr "pomoc"
+
+#~ msgid "/File/Sign"
+#~ msgstr "/Plik/Podpisz"
+
+#~ msgid "/File/Verify"
+#~ msgstr "/Plik/Weryfikuj"
+
+#~ msgid "/File/Encrypt"
+#~ msgstr "/Plik/Zaszyfruj"
+
+#~ msgid "/File/Decrypt"
+#~ msgstr "/Plik/Odszyfruj"
+
+#~ msgid "close files"
+#~ msgstr "zamknij pliki"
+
+#~ msgid "sign file"
+#~ msgstr "podpisz plik"
+
+#~ msgid "verify file"
+#~ msgstr "weryfikuj plik"
+
+#~ msgid "encrypt file"
+#~ msgstr "zaszyfruj plik"
+
+#~ msgid "decrypt file"
+#~ msgstr "odszyfruj plik"
+
+#, fuzzy
+#~ msgid "Open the clipboard"
+#~ msgstr "Otwiera okno menedÅ¼era plikÃ³w"
+
+#~ msgid "_Backup to file:"
+#~ msgstr "_Kopia zapasowa do pliku:"
+
+#~ msgid "B_rowse..."
+#~ msgstr "P_rzeglÄ…daj..."
+
+#, fuzzy
+#~ msgid "_Back"
+#~ msgstr "/_Kopia zapasowa..."
+
+#~ msgid "Brought to you by:"
+#~ msgstr "UÅ¼ywasz tego programu dziÄ™ki:"
+
+#, fuzzy
+#~ msgid "GPA is Free Software under the"
+#~ msgstr "GPA jest programem rozprowadzanym na"
+
+#~ msgid "GNU General Public License."
+#~ msgstr "Powszechniej Licencji Publicznej GNU."
+
+#~ msgid "For news see:"
+#~ msgstr "Aktualne wiadomoÅ›ci znajdujÄ… siÄ™ na:"
+
+#, fuzzy
+#~ msgid "http://www.gpg4win.org"
+#~ msgstr "http://www.gnupg.org"
+
+#~ msgid "http://www.gnupg.org"
+#~ msgstr "http://www.gnupg.org"
+
+#, fuzzy
+#~ msgid "GNU General Public License"
+#~ msgstr "Powszechniej Licencji Publicznej GNU."
+
+#, fuzzy
+#~ msgid "_GNU General Public License"
+#~ msgstr "Powszechniej Licencji Publicznej GNU."
+
+#~ msgid "Show Help Text\n"
+#~ msgstr "PokaÅ¼ tekst pomocy\n"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Pomoc"
+
+#~ msgid "/Help/_Contents"
+#~ msgstr "/Pomoc/_ZawartoÅ›Ä‡"
+
+#~ msgid "/Help/_License"
+#~ msgstr "/Pomoc/_Licencja"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/Pomoc/O _programie"
+
+#~ msgid "Please insert your name"
+#~ msgstr "ProszÄ™ podaÄ‡ swoje imiÄ™ i nazwisko"
+
+#~ msgid "Please insert your email address"
+#~ msgstr "ProszÄ™ wprowadziÄ‡ swÃ³j adres email"
+
+#~ msgid "/Keys/_Refresh"
+#~ msgstr "/Klucze/_OdÅ›wieÅ¼"
+
+#~ msgid "/Keys/sep0"
+#~ msgstr "/Klucze/sep0"
+
+#~ msgid "/Keys/_Delete Keys..."
+#~ msgstr "/Klucze/_UsuÅ„ Klucze..."
+
+#~ msgid "/Keys/sep1"
+#~ msgstr "/Klucze/sep1"
+
+#~ msgid "/Keys/_Sign Keys..."
+#~ msgstr "/Klucze/_Podpisz klucze..."
+
+#~ msgid "/Keys/Set _Owner Trust..."
+#~ msgstr "/Klucze/Ustawienie wartoÅ›ci zaufania do wÅ‚aÅ›ciciela..."
+
+#~ msgid "/Keys/_Edit Private Key..."
+#~ msgstr "/Klucze/_Edytuj klucz prywatny..."
+
+#~ msgid "/Keys/sep2"
+#~ msgstr "/Klucze/sep2"
+
+#~ msgid "/Keys/_Import Keys..."
+#~ msgstr "/Klucze/_Importuj klucze..."
+
+#~ msgid "/Keys/E_xport Keys..."
+#~ msgstr "/Klucze/E_ksportuj klucze..."
+
+#~ msgid "/Keys/_Backup..."
+#~ msgstr "/Klucze/Kopia zapa_sowa..."
+
+#~ msgid "/Server/_Send Keys..."
+#~ msgstr "/Serwer/_WyÅ›lij klucze..."
+
+#, fuzzy
+#~ msgid "/Windows/_File Manager"
+#~ msgstr "/Okna/MenadÅ¼er _plikÃ³w"
+
+#~ msgid "/Keys/Export Keys..."
+#~ msgstr "/Klucze/Eksportuj klucze..."
+
+#~ msgid "/Keys/Delete Keys..."
+#~ msgstr "/Klucze/UsuÅ„ klucze..."
+
+#~ msgid "/Server/Send Keys..."
+#~ msgstr "/Serwer/WyÅ›lij klucze..."
+
+#~ msgid "/Keys/Set Owner Trust..."
+#~ msgstr "/Klucze/Ustaw poziom zaufania do wÅ‚aÅ›ciciela..."
+
+#~ msgid "/Keys/Sign Keys..."
+#~ msgstr "/Klucze/Podpisz klucze..."
+
+#~ msgid "/Keys/Edit Private Key..."
+#~ msgstr "/Klucze/Edytuj klucz prywatny..."
+
+#~ msgid "/Keys/Backup..."
+#~ msgstr "/Klucze/Kopia zapasowa..."
+
+#~ msgid "/_Copy"
+#~ msgstr "/_Kopiuj"
+
+#~ msgid "/_Paste"
+#~ msgstr "/_Wklej"
+
+#~ msgid "/Set Owner Trust..."
+#~ msgstr "/Ustaw poziom zaufania do wÅ‚aÅ›ciciela..."
+
+#~ msgid "/Sign Keys..."
+#~ msgstr "/Podpisz klucze..."
+
+#~ msgid "/Edit Private Key..."
+#~ msgstr "/Edytuj prywatny klucz..."
+
+#~ msgid "/Backup..."
+#~ msgstr "/Kopia zapasowa..."
+
+#~ msgid "edit key"
+#~ msgstr "edycja klucza"
+
+#~ msgid "remove key"
+#~ msgstr "usuwa klucz"
+
+#~ msgid "sign key"
+#~ msgstr "podpisuje klucz"
+
+#~ msgid "import keys"
+#~ msgstr "importuj klucze"
+
+#~ msgid "export keys"
+#~ msgstr "eksport kluczy"
+
+#~ msgid "brief"
+#~ msgstr "zwiÄ™zÅ‚y"
+
+#~ msgid "detailed"
+#~ msgstr "szczegÃ³Å‚owy"
+
+#~ msgid "refresh keyring"
+#~ msgstr "odÅ›wieÅ¼a zbiÃ³r kluczy"
+
+#~ msgid "Settings"
+#~ msgstr "Ustawienia"
+
 #~ msgid "Sign files"
 #~ msgstr "Podpisz pliki"
 

Modified: trunk/po/pt_BR.po
===================================================================
--- trunk/po/pt_BR.po	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/pt_BR.po	2008-05-08 12:53:41 UTC (rev 891)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.6.1\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-03-12 12:29+0100\n"
+"POT-Creation-Date: 2008-05-08 14:51+0200\n"
 "PO-Revision-Date: 2003-01-20 18:39+0100\n"
 "Last-Translator: Renato Martini <rmartini at cipsga.org.br>\n"
 "Language-Team: PORTUGUES <rmartini at cipsga.org.br>\n"
@@ -14,430 +14,215 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/clipboard.c:367 src/fileman.c:350
+#: src/clipboard.c:376 src/fileman.c:392
 msgid "Open File"
 msgstr "Abrir arquivo"
 
-#: src/clipboard.c:395 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "Mensagem do GPA"
 
 #. TRANSLATORS: The arguments are the filename, the integer size
 #. and the unit (such as KB or MB).
-#: src/clipboard.c:412
+#: src/clipboard.c:421
 #, fuzzy, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
 msgstr ""
 "O arquivo %s já existe.\n"
 "Você quer sobrescrevê-lo?"
 
-#: src/clipboard.c:481
+#: src/clipboard.c:542
 msgid "Save As..."
 msgstr ""
 
-#: src/clipboard.c:522 src/clipboard.c:552 src/clipboard.c:582
-#: src/clipboard.c:612 src/clipboard.c:1113 src/fileman.c:675
-#: src/keyring.c:1657
+#: src/clipboard.c:583 src/clipboard.c:613 src/clipboard.c:643
+#: src/clipboard.c:673 src/clipboard.c:1034
 msgid "Clipboard"
 msgstr ""
 
-#: src/clipboard.c:692 src/fileman.c:472 src/keyring.c:863
-msgid "/_File"
+#: src/clipboard.c:755 src/fileman.c:515 src/keyring.c:884
+#, fuzzy
+msgid "_File"
 msgstr "/Ar_quivo"
 
-#: src/clipboard.c:693 src/fileman.c:474
+#: src/clipboard.c:756 src/fileman.c:516 src/keyring.c:885
 #, fuzzy
-msgid "/File/C_lear"
-msgstr "/Arquivo/_Fechar"
-
-#: src/clipboard.c:694 src/fileman.c:473
-msgid "/File/_Open"
-msgstr "/Arquivo/_Abrir"
-
-#: src/clipboard.c:695
-#, fuzzy
-msgid "/File/Save _As"
-msgstr "/Arquivo/_Fechar"
-
-#: src/clipboard.c:697 src/fileman.c:475
-msgid "/File/sep1"
-msgstr "/Arquivo/sep1"
-
-#: src/clipboard.c:698 src/fileman.c:476
-msgid "/File/_Sign"
-msgstr "/Arquivo/A_ssinar"
-
-#: src/clipboard.c:699 src/fileman.c:477
-msgid "/File/_Verify"
-msgstr "/Arquivo/_Verificar"
-
-#: src/clipboard.c:700 src/fileman.c:478
-msgid "/File/_Encrypt"
-msgstr "/Arquivo/En_criptar"
-
-#: src/clipboard.c:701 src/fileman.c:479
-msgid "/File/_Decrypt"
-msgstr "/Arquivo/_Desencriptar"
-
-#: src/clipboard.c:702 src/fileman.c:480
-msgid "/File/sep2"
-msgstr "/Arquivo/sep2"
-
-#: src/clipboard.c:703 src/fileman.c:481 src/keyring.c:864
-msgid "/File/_Close"
-msgstr "/Arquivo/_Fechar"
-
-#: src/clipboard.c:704 src/fileman.c:482 src/keyring.c:866
-msgid "/File/_Quit"
-msgstr "/Arquivo/Sai_r"
-
-#: src/clipboard.c:707 src/fileman.c:485 src/keyring.c:869
-msgid "/_Edit"
+msgid "_Edit"
 msgstr "_Editar"
 
-#: src/clipboard.c:710
-#, fuzzy
-msgid "/Edit/_Undo"
-msgstr "/Editar/_Copiar"
+#: src/clipboard.c:760
+msgid "Clear buffer"
+msgstr ""
 
-#: src/clipboard.c:711
-#, fuzzy
-msgid "/Edit/_Redo"
-msgstr "/Editar/_Copiar"
+#: src/clipboard.c:762 src/fileman.c:520
+msgid "Open a file"
+msgstr "Abrir um arquivo"
 
-#: src/clipboard.c:712
+#: src/clipboard.c:764
 #, fuzzy
-msgid "/Edit/sep0"
-msgstr "/Editar/sep2"
+msgid "Save to a file"
+msgstr "Abrir um arquivo"
 
-#: src/clipboard.c:714 src/clipboard.c:750
+#: src/clipboard.c:766
 #, fuzzy
-msgid "/Edit/Cut"
-msgstr "/Editar/Copiar"
+msgid "Sign buffer text"
+msgstr "assinar chave"
 
-#: src/clipboard.c:715 src/keyring.c:870
-msgid "/Edit/_Copy"
-msgstr "/Editar/_Copiar"
-
-#: src/clipboard.c:716 src/keyring.c:872
-msgid "/Edit/_Paste"
-msgstr "/Editar/C_olar"
-
-#: src/clipboard.c:717
+#: src/clipboard.c:768
 #, fuzzy
-msgid "/Edit/_Delete"
-msgstr "/Editar/C_olar"
+msgid "Check signatures of buffer text"
+msgstr "Verificar assinaturas para o arquivo escolhido"
 
-#: src/clipboard.c:718 src/keyring.c:874
-msgid "/Edit/sep1"
-msgstr "/Editar/sep1"
-
-#: src/clipboard.c:719 src/fileman.c:486 src/keyring.c:875
-msgid "/Edit/Select _All"
-msgstr "/Editar/Selecionar _Tudo"
-
-#: src/clipboard.c:721 src/fileman.c:487 src/keyring.c:876
-msgid "/Edit/sep2"
-msgstr "/Editar/sep2"
-
-#: src/clipboard.c:722 src/fileman.c:488 src/keyring.c:877
-msgid "/Edit/Pr_eferences..."
-msgstr "/Editar/Pr_eferências..."
-
-#: src/clipboard.c:724 src/fileman.c:490 src/keyring.c:879
+#: src/clipboard.c:770
 #, fuzzy
-msgid "/Edit/_Backend Preferences..."
-msgstr "/Editar/Pr_eferências..."
+msgid "Encrypt the buffer text"
+msgstr "Encriptar o arquivo selecionado"
 
-#: src/clipboard.c:728 src/fileman.c:494 src/keyring.c:906
-msgid "/_Windows"
-msgstr "/_Janelas"
-
-#: src/clipboard.c:729 src/fileman.c:495 src/keyring.c:907
-msgid "/Windows/_Keyring Editor"
-msgstr "/Janelas/_Editor do chaveiro"
-
-#: src/clipboard.c:730 src/fileman.c:496
-msgid "/Windows/_Filemanager"
-msgstr "/Janelas/_Gerenciador de arquivos"
-
-#: src/clipboard.c:731 src/fileman.c:497 src/keyring.c:909
+#: src/clipboard.c:772
 #, fuzzy
-msgid "/Windows/_Clipboard"
-msgstr "/Janelas/_Gerenciador de arquivos"
+msgid "Decrypt the buffer text"
+msgstr "Desencriptar o arquivo selecionado"
 
-#: src/clipboard.c:758 src/keyring.c:948
-msgid "/Edit/Copy"
-msgstr "/Editar/Copiar"
-
-#: src/clipboard.c:766
-#, fuzzy
-msgid "/Edit/Delete"
-msgstr "/Editar/Selecionar _Tudo"
-
 #: src/clipboard.c:774
-#, fuzzy
-msgid "/Edit/Paste"
-msgstr "/Editar/C_olar"
-
-#: src/clipboard.c:879
-msgid "Clear buffer"
+msgid "Close the buffer"
 msgstr ""
 
-#: src/clipboard.c:879
-msgid "clear buffer"
+#: src/clipboard.c:776 src/fileman.c:534 src/keyring.c:893
+msgid "Quit the program"
 msgstr ""
 
-#: src/clipboard.c:887 src/fileman.c:602
-msgid "Open a file"
-msgstr "Abrir um arquivo"
-
-#: src/clipboard.c:887 src/fileman.c:602
-msgid "open file"
-msgstr "abrir um arquivo"
-
-#: src/clipboard.c:892
+#: src/clipboard.c:782
 #, fuzzy
-msgid "Save to a file"
-msgstr "Abrir um arquivo"
+msgid "Undo the last action"
+msgstr "Encriptar o arquivo selecionado"
 
-#: src/clipboard.c:892
-#, fuzzy
-msgid "save file as"
-msgstr "Gravar o arquivo _como"
+#: src/clipboard.c:784
+msgid "Redo the last undone action"
+msgstr ""
 
-#: src/clipboard.c:900
+#: src/clipboard.c:787
 #, fuzzy
 msgid "Cut the selection"
 msgstr "Encriptar o arquivo selecionado"
 
-#: src/clipboard.c:901
+#: src/clipboard.c:789 src/keyring.c:897
 #, fuzzy
-msgid "cut the selection"
-msgstr "Encriptar o arquivo selecionado"
-
-#: src/clipboard.c:907
-#, fuzzy
 msgid "Copy the selection"
 msgstr "Encriptar o arquivo selecionado"
 
-#: src/clipboard.c:908
-#, fuzzy
-msgid "copy the selection"
-msgstr "Encriptar o arquivo selecionado"
-
-#: src/clipboard.c:914
+#: src/clipboard.c:791 src/keyring.c:899
 msgid "Paste the clipboard"
 msgstr ""
 
-#: src/clipboard.c:915
+#: src/clipboard.c:793
 #, fuzzy
-msgid "paste the clipboard"
-msgstr "I_mportar do arquivo:"
-
-#: src/clipboard.c:925 src/fileman.c:612 src/keyring.c:1570
-msgid "Sign"
-msgstr "Assinar"
-
-#: src/clipboard.c:926
-#, fuzzy
-msgid "Sign the selected text"
-msgstr "Assinar a chave selecionada"
-
-#: src/clipboard.c:927
-#, fuzzy
-msgid "sign text"
-msgstr "assinar chave"
-
-#: src/clipboard.c:935 src/fileman.c:623
-msgid "Verify"
-msgstr "Verificar"
-
-#: src/clipboard.c:936
-#, fuzzy
-msgid "Check signatures of selected text"
-msgstr "Verificar assinaturas para o arquivo escolhido"
-
-#: src/clipboard.c:937
-#, fuzzy
-msgid "verify text"
-msgstr "verificar arquivo"
-
-#: src/clipboard.c:945 src/fileman.c:634
-msgid "Encrypt"
-msgstr "Encriptar"
-
-#: src/clipboard.c:946
-#, fuzzy
-msgid "Encrypt the selected text"
-msgstr "Encriptar o arquivo selecionado"
-
-#: src/clipboard.c:947
-#, fuzzy
-msgid "encrypt text"
-msgstr "encriptar arquivo"
-
-#: src/clipboard.c:955 src/fileman.c:645
-msgid "Decrypt"
-msgstr "_Desencriptar"
-
-#: src/clipboard.c:956
-#, fuzzy
-msgid "Decrypt the selected text"
+msgid "Delete the selected text"
 msgstr "Desencriptar o arquivo selecionado"
 
-#: src/clipboard.c:957
-#, fuzzy
-msgid "decrypt text"
-msgstr "desencriptar arquivo"
+#: src/clipboard.c:795
+msgid "Select the entire document"
+msgstr ""
 
-#: src/clipboard.c:967 src/fileman.c:658 src/keyring.c:1631
+#: src/clipboard.c:902 src/fileman.c:625
 #, fuzzy
-msgid "Open the preferences dialog"
-msgstr "Abrir caixa de diálogo das Preferências"
-
-#: src/clipboard.c:968 src/fileman.c:659 src/keyring.c:1632
-msgid "preferences"
-msgstr "preferências"
-
-#: src/clipboard.c:975 src/fileman.c:666
-#, fuzzy
 msgid "Keyring"
 msgstr "Editor do chaveiro digital"
 
-#: src/clipboard.c:976 src/fileman.c:667
-#, fuzzy
-msgid "Open the keyring editor"
-msgstr "abre editor do chaveiro digital (padrão)"
-
-#: src/clipboard.c:977 src/fileman.c:668
-#, fuzzy
-msgid "keyring editor"
-msgstr "Editor do chaveiro digital"
-
-#: src/clipboard.c:983 src/keyring.c:1648
+#: src/clipboard.c:904 src/keyring.c:1073
 msgid "Files"
 msgstr "Arquivos"
 
-#: src/clipboard.c:984 src/keyring.c:1649
+#: src/clipboard.c:1004
 #, fuzzy
-msgid "Open the file manager"
-msgstr "Abrir Gerenciador de arquivos"
-
-#: src/clipboard.c:985 src/keyring.c:1650
-msgid "file manager"
-msgstr "gerenciador de arquivos"
-
-#: src/clipboard.c:992 src/fileman.c:684 src/keyring.c:1665
-msgid "Help"
-msgstr "Ajuda"
-
-#: src/clipboard.c:993 src/fileman.c:685 src/keyring.c:1666
-msgid "Understanding the GNU Privacy Assistant"
-msgstr "Compreendendo o GNU Privacy Assistant"
-
-#: src/clipboard.c:994 src/fileman.c:686 src/keyring.c:1667
-msgid "help"
-msgstr "ajuda"
-
-#: src/clipboard.c:1084
-#, fuzzy
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Privacy Assistant - Gerenciador de arquivos"
 
-#: src/confdialog.c:993
+#: src/confdialog.c:994
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 #, fuzzy
 msgid "Use default values"
 msgstr "Indicar chave secreta padrão."
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 #, fuzzy
 msgid "Use default value"
 msgstr "Indicar chave secreta padrão."
 
-#: src/confdialog.c:1146
+#: src/confdialog.c:1147
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1155
+#: src/confdialog.c:1156
 #, fuzzy
 msgid "Use default argument"
 msgstr "Indicar destinatários default"
 
-#: src/confdialog.c:1280
+#: src/confdialog.c:1281
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1325
+#: src/confdialog.c:1326
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1334
+#: src/confdialog.c:1332
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1346
+#: src/confdialog.c:1351
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1350
+#: src/confdialog.c:1355
 #, fuzzy
 msgid "Level:"
 msgstr "Nunca"
 
-#: src/confdialog.c:1359
+#: src/confdialog.c:1364
 #, fuzzy
 msgid "Basic"
 msgstr "/_Backup..."
 
-#: src/confdialog.c:1360
+#: src/confdialog.c:1365
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1361
+#: src/confdialog.c:1366
 #, fuzzy
 msgid "Expert"
 msgstr "Exportar"
 
-#: src/encryptdlg.c:142 src/expirydlg.c:116 src/filesigndlg.c:133
-#: src/gpabackupop.c:292 src/gpaprogressdlg.c:146 src/gparecvkeydlg.c:96
-#: src/gpawizard.c:289 src/gpgmetools.c:696 src/keygendlg.c:149
-#: src/ownertrustdlg.c:111 src/passwddlg.c:100
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: src/encryptdlg.c:143
+#: src/encryptdlg.c:139
 #, fuzzy
 msgid "Encrypt documents"
 msgstr "Encriptar arquivos"
 
-#: src/encryptdlg.c:174
+#: src/encryptdlg.c:156
 msgid "_Public Keys"
 msgstr "_Chaves públicas"
 
-#: src/encryptdlg.c:177
+#: src/encryptdlg.c:179 src/icons.c:198
 msgid "_Sign"
 msgstr "_Assinar"
 
-#: src/encryptdlg.c:201 src/filesigndlg.c:185
+#: src/encryptdlg.c:185
 msgid "Sign _as "
 msgstr "Assinar _como"
 
-#: src/encryptdlg.c:215 src/filesigndlg.c:187
+#: src/encryptdlg.c:215 src/filesigndlg.c:227
 msgid "A_rmor"
 msgstr "Armor"
 
@@ -445,153 +230,101 @@
 msgid "Please provide a correct date."
 msgstr "Queira indicar uma data correta"
 
-#: src/expirydlg.c:111
+#: src/expirydlg.c:108
 msgid "Change expiry date"
 msgstr "Muda a data de expiração"
 
-#: src/expirydlg.c:129
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#: src/expirydlg.c:124
 msgid "_never expire"
 msgstr "_nunca expira"
 
-#: src/expirydlg.c:134
+#: src/expirydlg.c:129
 msgid "_expire on:"
 msgstr "_expira em:"
 
-#: src/fileman.c:355 src/fileman.c:953
-msgid "The file is already open."
-msgstr "O arquivo já está aberto"
-
-#: src/fileman.c:516
+#: src/fileman.c:522
 #, fuzzy
-msgid "/File/Sign"
-msgstr "/Arquivo/A_ssinar"
-
-#: src/fileman.c:521
-#, fuzzy
-msgid "/File/Verify"
-msgstr "/Arquivo/_Verificar"
-
-#: src/fileman.c:526
-#, fuzzy
-msgid "/File/Encrypt"
-msgstr "/Arquivo/En_criptar"
-
-#: src/fileman.c:531
-#, fuzzy
-msgid "/File/Decrypt"
-msgstr "/Arquivo/_Desencriptar"
-
-#: src/fileman.c:606
-#, fuzzy
 msgid "Close all files"
 msgstr "Abrir um arquivo"
 
-#: src/fileman.c:606
-#, fuzzy
-msgid "close files"
-msgstr "abrir um arquivo"
-
-#: src/fileman.c:613
+#: src/fileman.c:524
 msgid "Sign the selected file"
 msgstr "Assinar o arquivo selecionado"
 
-#: src/fileman.c:614
-msgid "sign file"
-msgstr "assinar arquivo"
-
-#: src/fileman.c:624
+#: src/fileman.c:526
 msgid "Check signatures of selected file"
 msgstr "Verificar assinaturas para o arquivo escolhido"
 
-#: src/fileman.c:625
-msgid "verify file"
-msgstr "verificar arquivo"
-
-#: src/fileman.c:635
+#: src/fileman.c:528
 msgid "Encrypt the selected file"
 msgstr "Encriptar o arquivo selecionado"
 
-#: src/fileman.c:636
-msgid "encrypt file"
-msgstr "encriptar arquivo"
-
-#: src/fileman.c:646
+#: src/fileman.c:530
 msgid "Decrypt the selected file"
 msgstr "Desencriptar o arquivo selecionado"
 
-#: src/fileman.c:647
-msgid "decrypt file"
-msgstr "desencriptar arquivo"
+#: src/fileman.c:532
+msgid "Close the window"
+msgstr ""
 
-#: src/fileman.c:676 src/keyring.c:1658
+#: src/fileman.c:538
 #, fuzzy
-msgid "Open the clipboard"
-msgstr "Abrir Gerenciador de arquivos"
+msgid "Select all files"
+msgstr "Abrir um arquivo"
 
-#: src/fileman.c:677 src/keyring.c:1659
-msgid "clipboard"
-msgstr ""
-
-#: src/fileman.c:785
+#: src/fileman.c:731
 msgid "File"
 msgstr "Arquivo"
 
-#: src/fileman.c:850
+#: src/fileman.c:796
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Gerenciador de arquivos"
 
-#: src/fileman.c:876
+#: src/fileman.c:819
 #, fuzzy
 msgid "File Manager"
 msgstr "gerenciador de arquivos"
 
-#: src/filesigndlg.c:134
+#: src/fileman.c:895
+msgid "The file is already open."
+msgstr "O arquivo já está aberto"
+
+#: src/filesigndlg.c:171
 msgid "Sign documents"
 msgstr ""
 
-#: src/filesigndlg.c:144
-msgid "Signing Mode"
+#: src/filesigndlg.c:180
+#, fuzzy
+msgid "<b>Sign _as</b>"
+msgstr "Assinar _como"
+
+#: src/filesigndlg.c:201
+#, fuzzy
+msgid "<b>Signing Mode</b>"
 msgstr "Modo de assinatura"
 
-#: src/filesigndlg.c:152
-msgid "si_gn and compress"
+#: src/filesigndlg.c:211
+#, fuzzy
+msgid "Si_gn and compress"
 msgstr "assi_nar e comprimir"
 
-#: src/filesigndlg.c:158
-msgid "_cleartext signature"
+#: src/filesigndlg.c:217
+#, fuzzy
+msgid "Clear_text signature"
 msgstr "_assinatura em texto puro"
 
-#: src/filesigndlg.c:165
+#: src/filesigndlg.c:223
 #, fuzzy
-msgid "_detached signature"
+msgid "_Detached signature"
 msgstr "_assinatura em texto puro"
 
-#: src/gpabackupop.c:213 src/gpgmetools.c:138
+#: src/gpabackupop.c:208
 #, c-format
 msgid ""
-"The file %s already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"O arquivo %s já existe.\n"
-"Você quer sobrescrevê-lo?"
-
-#: src/gpabackupop.c:216 src/gpaexportserverop.c:134
-#: src/gpafileencryptop.c:455 src/gpafileverifyop.c:178 src/gpgmetools.c:141
-#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:62
-#: src/settingsdlg.c:165
-msgid "_Yes"
-msgstr "_Sim"
-
-#: src/gpabackupop.c:217 src/gpaexportserverop.c:135
-#: src/gpafileencryptop.c:456 src/gpafileverifyop.c:179 src/gpgmetools.c:142
-#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:64
-#: src/settingsdlg.c:168
-msgid "_No"
-msgstr "_Não"
-
-#: src/gpabackupop.c:229
-#, c-format
-msgid ""
 "A copy of your secret key has been made to the file:\n"
 "\n"
 "\t\"%s\"\n"
@@ -606,32 +339,20 @@
 "Isto é uma informação sensível, e deve ser guardada com cuidado\n"
 "(por exemplo, num disquete e colocado num lugar seguro)."
 
-#: src/gpabackupop.c:244
+#: src/gpabackupop.c:223
 msgid "An error ocurred during the backup operation."
 msgstr ""
 
-#: src/gpabackupop.c:260
+#: src/gpabackupop.c:245
 #, fuzzy
 msgid "Backup key to file"
 msgstr "E_xportar para o arquivo:"
 
-#: src/gpabackupop.c:287
-msgid "Backup Keys"
-msgstr "Backup de chaves"
-
-#: src/gpabackupop.c:311
+#: src/gpabackupop.c:255
 #, c-format
 msgid "Generating backup of key: %s"
 msgstr "Gerando backup de chave: %s"
 
-#: src/gpabackupop.c:317
-msgid "_Backup to file:"
-msgstr "E_xportar para o arquivo:"
-
-#: src/gpabackupop.c:329
-msgid "B_rowse..."
-msgstr "I_nvestigar..."
-
 #: src/gpa.c:92
 #, fuzzy
 msgid "Output version information and exit"
@@ -652,26 +373,31 @@
 msgstr ""
 
 #: src/gpa.c:100
-msgid "Start only the UI server (implies --cms)"
+#, fuzzy
+msgid "Open the settings dialog"
+msgstr "Abrir caixa de diálogo das Preferências"
+
+#: src/gpa.c:102
+msgid "Enable the UI server (implies --cms)"
 msgstr ""
 
-#: src/gpa.c:102
+#: src/gpa.c:104
 #, fuzzy
 msgid "Read options from file"
 msgstr "ler as preferências do arquivo"
 
-#: src/gpa.c:293
+#: src/gpa.c:286
 msgid "[FILE...]"
 msgstr ""
 
-#: src/gpa.c:295
+#: src/gpa.c:288
 #, fuzzy
 msgid "Graphical frontend to GnuPG"
 msgstr ""
 "Sintaxe: gpa [opções]\n"
 "Interface gráfica para o GnuPG\n"
 
-#: src/gpa.c:296
+#: src/gpa.c:289
 msgid "Please report bugs to <"
 msgstr "Por favor envie os bugs para <"
 
@@ -679,16 +405,16 @@
 msgid "The keys have been copied to the clipboard."
 msgstr ""
 
-#: src/gpaexportfileop.c:133
+#: src/gpaexportfileop.c:139
 msgid "Export public keys to file"
 msgstr "Exportar as chaves públicas num arquivo"
 
-#: src/gpaexportfileop.c:137
+#: src/gpaexportfileop.c:150
 #, fuzzy
 msgid "_armor"
 msgstr "Armor"
 
-#: src/gpaexportfileop.c:171
+#: src/gpaexportfileop.c:182
 #, fuzzy, c-format
 msgid "The keys have been exported to %s."
 msgstr "Esta chave expirou! Impossível assinar."
@@ -701,6 +427,18 @@
 "Are you sure you want to distribute this key?"
 msgstr ""
 
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:459
+#: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
+#: src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Sim"
+
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:460
+#: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
+#: src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_Não"
+
 #: src/gpaexportserverop.c:187
 msgid "The keys have been sent to the server."
 msgstr ""
@@ -710,29 +448,29 @@
 msgid "Decrypting..."
 msgstr "_Desencriptar"
 
-#: src/gpafiledecryptop.c:358 src/gpafileverifyop.c:449
+#: src/gpafiledecryptop.c:367 src/gpafileverifyop.c:464
 #, fuzzy, c-format
 msgid "\"%s\" contained no OpenPGP data."
 msgstr "O arquivo \"%s\" não contém dados encriptados válidos."
 
-#: src/gpafiledecryptop.c:359 src/gpafileverifyop.c:450
+#: src/gpafiledecryptop.c:368 src/gpafileverifyop.c:465
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no OpenPGPdata."
 msgstr "O arquivo \"%s\" não contém dados encriptados válidos."
 
-#: src/gpafiledecryptop.c:369
+#: src/gpafiledecryptop.c:378
 #, fuzzy, c-format
 msgid "\"%s\" contained no valid encrypted data."
 msgstr "O arquivo \"%s\" não contém dados encriptados válidos."
 
-#: src/gpafiledecryptop.c:371
+#: src/gpafiledecryptop.c:380
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no validencrypted data."
 msgstr "O arquivo \"%s\" não contém dados encriptados válidos."
 
-#: src/gpafiledecryptop.c:380 src/gpafileencryptop.c:727
-#: src/gpafilesignop.c:510 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
-#: src/gpakeypasswdop.c:197 src/gpakeysignop.c:229
+#: src/gpafiledecryptop.c:389 src/gpafileencryptop.c:751
+#: src/gpafilesignop.c:525 src/gpafileverifyop.c:475 src/gpakeyexpireop.c:240
+#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:237
 msgid "Wrong passphrase!"
 msgstr "Senha errada!"
 
@@ -741,62 +479,61 @@
 msgid "Encrypting..."
 msgstr "Encriptar"
 
-#: src/gpafileencryptop.c:453 src/verifydlg.c:222
+#: src/gpafileencryptop.c:457 src/verifydlg.c:222
 msgid "Unknown Key"
 msgstr "Chave desconhecida"
 
-#: src/gpafileencryptop.c:469
+#: src/gpafileencryptop.c:473
 #, fuzzy
 msgid "You are going to encrypt a document using the following key:"
 msgstr "Você está encriptando um arquivo usando a seguinte chave:"
 
-#: src/gpafileencryptop.c:475
+#: src/gpafileencryptop.c:479
 msgid "However, it is not certain that the key belongs to that person."
 msgstr "No entanto, não é certo que esta chave pertença a esta pessoa."
 
-#: src/gpafileencryptop.c:481
+#: src/gpafileencryptop.c:485
 msgid "Do you <b>really</b> want to use this key?"
 msgstr "Você <b>realmente</b> quer usar esta chave?"
 
-#: src/gpafileencryptop.c:502 src/gpafileencryptop.c:542 src/verifydlg.c:227
+#: src/gpafileencryptop.c:506 src/gpafileencryptop.c:546 src/verifydlg.c:227
 msgid "Revoked Key"
 msgstr "Chave revogada"
 
-#: src/gpafileencryptop.c:504 src/gpafileencryptop.c:544 src/gpawizard.c:281
-#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:422
-#: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
+#: src/gpafileencryptop.c:508 src/gpafileencryptop.c:548 src/gtktools.c:52
+#: src/gtktools.c:86 src/keyeditdlg.c:149 src/verifydlg.c:115
 msgid "_Close"
 msgstr "_Fechar"
 
-#: src/gpafileencryptop.c:517
+#: src/gpafileencryptop.c:521
 msgid "The following key has been revoked by it's owner:"
 msgstr "A seguinte chave foi revogada pelo seu proprietário:"
 
-#: src/gpafileencryptop.c:522 src/gpafileencryptop.c:565
+#: src/gpafileencryptop.c:526 src/gpafileencryptop.c:569
 msgid "And can not be used for encryption."
 msgstr "E não pode ser usada para encriptação."
 
-#: src/gpafileencryptop.c:557
+#: src/gpafileencryptop.c:561
 #, c-format
 msgid "The following key expired on %s:"
 msgstr "A seguinte chave expira em %s:"
 
-#: src/gpafileencryptop.c:641 src/gpafilesignop.c:414
+#: src/gpafileencryptop.c:600 src/gpafilesignop.c:448
+msgid ""
+"The selected certificates are not all of the same type. That is, you mixed "
+"OpenPGP and X.509 certificates. Please make sure to select only certificates "
+"of the same type."
+msgstr ""
+
+#: src/gpafileencryptop.c:675 src/gpafilesignop.c:434
 msgid "You didn't select any key for signing"
 msgstr "Nenhuma chave selecionada para assinatura"
 
-#: src/gpafilesignop.c:148
+#: src/gpafilesignop.c:157
 #, fuzzy
 msgid "Signing..."
 msgstr "Modo de assinatura"
 
-#: src/gpafilesignop.c:428
-msgid ""
-"The selected certificates are not all of the same type. That is, you mixed "
-"OpenPGP and X.509 certificates. Please make sure to select only certificates "
-"of the same type."
-msgstr ""
-
 #: src/gpafileverifyop.c:101
 #, fuzzy
 msgid "Verifying..."
@@ -816,15 +553,15 @@
 msgid "Generating Key..."
 msgstr "/Chaves/_Gerar Chave..."
 
-#: src/gpaimportfileop.c:131
+#: src/gpaimportfileop.c:132
 msgid "Import public keys from file"
 msgstr "Importar chave pública de um arquivo"
 
-#: src/gpaimportop.c:197
+#: src/gpaimportop.c:196
 msgid "No keys were found."
 msgstr "Nenhuma chave foi encontrada."
 
-#: src/gpaimportop.c:205
+#: src/gpaimportop.c:204
 #, c-format
 msgid ""
 "%i public keys read\n"
@@ -841,35 +578,35 @@
 "%i chave secreta importada\n"
 "%i chave secreta sem alterações"
 
-#: src/gpakeyexpireop.c:239
+#: src/gpakeyexpireop.c:244
 msgid ""
 "Invalid time given.\n"
 "(you may not set the expiration time to the past.)"
 msgstr ""
 
-#: src/gpakeyselector.c:86 src/keylist.c:567 src/siglist.c:94
+#: src/gpakeyselector.c:86 src/keylist.c:555 src/siglist.c:94
 #: src/siglist.c:114 src/verifydlg.c:324
 msgid "Key ID"
 msgstr "Key ID"
 
-#: src/gpakeyselector.c:95 src/keylist.c:618 src/siglist.c:100
+#: src/gpakeyselector.c:95 src/keylist.c:606 src/siglist.c:100
 #: src/siglist.c:143 src/verifydlg.c:336
 msgid "User Name"
 msgstr "Nome do Usuário"
 
-#: src/gpakeysignop.c:188
+#: src/gpakeysignop.c:191
 msgid "No private key for signing."
 msgstr "Nenhuma chave privada para assinar."
 
-#: src/gpakeysignop.c:233
+#: src/gpakeysignop.c:241
 msgid "This key has expired! Unable to sign."
 msgstr "Esta chave expirou! Impossível assinar."
 
-#: src/gpakeysignop.c:237
+#: src/gpakeysignop.c:245
 msgid "This key has already been signed with your own!"
 msgstr "Esta chave já está assinada com sua chave!"
 
-#: src/gpakeysignop.c:242
+#: src/gpakeysignop.c:250
 msgid "You haven't selected a default key to sign with!"
 msgstr "Você não selecionou uma chave default para assinar!"
 
@@ -897,7 +634,7 @@
 msgid "unknown"
 msgstr "desconhecido"
 
-#: src/gparecvkeydlg.c:101
+#: src/gparecvkeydlg.c:106
 msgid "Which key do you want to import? (The key must be specified by key ID)."
 msgstr ""
 
@@ -923,7 +660,7 @@
 msgid "Size"
 msgstr ""
 
-#: src/gpasubkeylist.c:97 src/keyeditdlg.c:171 src/keylist.c:580
+#: src/gpasubkeylist.c:97 src/keyeditdlg.c:168 src/keylist.c:568
 msgid "Expiry Date"
 msgstr "Date de expiração"
 
@@ -945,16 +682,16 @@
 msgid "Can authenticate"
 msgstr ""
 
-#: src/gpasubkeylist.c:137 src/gpgmetools.c:613 src/gpgmetools.c:821
-#: src/gpgmetools.c:940
+#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:833
+#: src/gpgmetools.c:952
 msgid "Revoked"
 msgstr "Revogado"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:615 src/gpgmetools.c:936
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:948
 msgid "Expired"
 msgstr "Expirado"
 
-#: src/gpasubkeylist.c:145 src/gpgmetools.c:617
+#: src/gpasubkeylist.c:145 src/gpgmetools.c:626
 msgid "Disabled"
 msgstr "Desabilitado"
 
@@ -963,41 +700,41 @@
 msgid "Unsigned"
 msgstr "assinado"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:927 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:939 src/verifydlg.c:212
 msgid "Valid"
 msgstr "Válido"
 
-#: src/gpawidgets.c:72 src/gpgmetools.c:661 src/gpgmetools.c:668
-#: src/keyring.c:1176 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
+#: src/keyring.c:1248 src/keysigndlg.c:100
 msgid "User Name:"
 msgstr "Nome do Usuário:"
 
-#: src/gpawidgets.c:72 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/keysigndlg.c:100
 msgid "User Names:"
 msgstr "Nomes de Usuário:"
 
-#: src/gpawidgets.c:78 src/gpgmetools.c:662 src/gpgmetools.c:669
-#: src/keyring.c:1178
+#: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
+#: src/keyring.c:1250
 msgid "Key ID:"
 msgstr "Key ID:"
 
-#: src/gpawidgets.c:194
+#: src/gpawidgets.c:180
 msgid "Expiration"
 msgstr "Expiração"
 
-#: src/gpawidgets.c:201
+#: src/gpawidgets.c:187
 msgid "_indefinitely valid"
 msgstr "_válida indefinidamente"
 
-#: src/gpawidgets.c:210
+#: src/gpawidgets.c:195
 msgid "expire _after"
 msgstr "expira _após"
 
-#: src/gpawidgets.c:229
+#: src/gpawidgets.c:215
 msgid "expire o_n:"
 msgstr "_expira em:"
 
-#: src/gpawidgets.c:302 src/keygendlg.c:295
+#: src/gpawidgets.c:289 src/keygendlg.c:291
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -1005,20 +742,7 @@
 "!ERRO FATAL!\n"
 "Forma de inserção inválida para a data de expiração."
 
-#: src/gpawizard.c:260
-#, fuzzy
-msgid "_Back"
-msgstr "/_Backup..."
-
-#: src/gpawizard.c:267
-msgid "_Forward"
-msgstr ""
-
-#: src/gpawizard.c:274
-msgid "_Apply"
-msgstr ""
-
-#: src/gpgmetools.c:58
+#: src/gpgmetools.c:59
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -1035,7 +759,7 @@
 "\n"
 "O aplicativo será encerrado"
 
-#: src/gpgmetools.c:72
+#: src/gpgmetools.c:73
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -1047,8 +771,17 @@
 "GPA will now try to recover from this error."
 msgstr ""
 
-#: src/gpgmetools.c:477
+#: src/gpgmetools.c:139
+#, c-format
 msgid ""
+"The file %s already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"O arquivo %s já existe.\n"
+"Você quer sobrescrevê-lo?"
+
+#: src/gpgmetools.c:486
+msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
 "* a safe place.                                                        *\n"
@@ -1063,7 +796,7 @@
 "****************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:482
+#: src/gpgmetools.c:491
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -1071,190 +804,178 @@
 "A chave copiada por segurança para este arquivo é:\n"
 "\n"
 
-#: src/gpgmetools.c:543
+#: src/gpgmetools.c:552
 msgid "DSA and ElGamal (default)"
 msgstr "DSA e ElGamal (default)"
 
-#: src/gpgmetools.c:544
+#: src/gpgmetools.c:553
 msgid "DSA (sign only)"
 msgstr "DSA (assinatura somente)"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:554
 msgid "RSA (sign only)"
 msgstr "RSA (assinatura somente)"
 
-#: src/gpgmetools.c:581 src/gpgmetools.c:604 src/gpgmetools.c:621
-#: src/gpgmetools.c:932 src/gpgmetools.c:965
+#: src/gpgmetools.c:590 src/gpgmetools.c:613 src/gpgmetools.c:630
+#: src/gpgmetools.c:944 src/gpgmetools.c:977
 msgid "Unknown"
 msgstr "desconhecido"
 
-#: src/gpgmetools.c:584
+#: src/gpgmetools.c:593
 msgid "Never"
 msgstr "Nunca"
 
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:596
 msgid "Marginal"
 msgstr "Moderado"
 
-#: src/gpgmetools.c:590
+#: src/gpgmetools.c:599
 msgid "Full"
 msgstr "Completo"
 
-#: src/gpgmetools.c:593
+#: src/gpgmetools.c:602
 msgid "Ultimate"
 msgstr "Inteira"
 
-#: src/gpgmetools.c:619
+#: src/gpgmetools.c:628
 msgid "Incomplete"
 msgstr "Incompleto"
 
-#: src/gpgmetools.c:625
+#: src/gpgmetools.c:634
 msgid "Fully Valid"
 msgstr "Totalmente válido"
 
-#: src/gpgmetools.c:659
+#: src/gpgmetools.c:668
 msgid "Please enter the passphrase for the following key:"
 msgstr "Queria indicar a senha para a seguinte chave:"
 
-#: src/gpgmetools.c:667
+#: src/gpgmetools.c:676
 msgid "Wrong passphrase, please try again:"
 msgstr "Senha errada, por favor tente de novo:"
 
-#: src/gpgmetools.c:692
+#: src/gpgmetools.c:701
 msgid "Enter Passphrase"
 msgstr "Entrar com a senha"
 
-#: src/gpgmetools.c:814
+#: src/gpgmetools.c:826
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:904 src/verifydlg.c:269
+#: src/gpgmetools.c:916 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[User ID desconhecido]"
 
-#: src/gpgmetools.c:930 src/verifydlg.c:217
+#: src/gpgmetools.c:942 src/verifydlg.c:217
 msgid "Bad"
 msgstr "Ruim"
 
-#: src/gpgmetools.c:953
+#: src/gpgmetools.c:965
 msgid "Generic"
 msgstr ""
 
-#: src/gpgmetools.c:956
+#: src/gpgmetools.c:968
 msgid "Persona"
 msgstr ""
 
-#: src/gpgmetools.c:959
+#: src/gpgmetools.c:971
 msgid "Casual"
 msgstr ""
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:974
 msgid "Positive"
 msgstr ""
 
-#: src/gpgmetools.c:980
+#: src/gpgmetools.c:992
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 
-#: src/gpgmetools.c:983
+#: src/gpgmetools.c:995
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:1001
 #, fuzzy
 msgid "The key can be used for certification and encryption."
 msgstr "E não pode ser usada para encriptação."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:1004
 #, fuzzy
 msgid "The key can be used only for certification."
 msgstr "E não pode ser usada para encriptação."
 
-#: src/gpgmetools.c:1000
+#: src/gpgmetools.c:1012
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
 msgstr ""
 
-#: src/gpgmetools.c:1003
+#: src/gpgmetools.c:1015
 #, fuzzy
 msgid "The key can be used only for signing."
 msgstr "Nenhuma chave selecionada para assinar."
 
-#: src/gpgmetools.c:1008
+#: src/gpgmetools.c:1020
 #, fuzzy
 msgid "The key can be used only for encryption."
 msgstr "E não pode ser usada para encriptação."
 
-#: src/gpgmetools.c:1011
+#: src/gpgmetools.c:1023
 msgid "This key is useless."
 msgstr ""
 
-#: src/gtktools.c:320
+#: src/gtktools.c:48
 msgid "GPA Error"
 msgstr "Erro do GPA"
 
-#: src/helpmenu.c:202
+#: src/helpmenu.c:83
 msgid "About GPA"
 msgstr "Sobre GPA"
 
-#: src/helpmenu.c:247
-msgid "Brought to you by:"
-msgstr "Criado para você por"
+#: src/helpmenu.c:89
+#, fuzzy
+msgid "GPA is the GNU Privacy Assistant."
+msgstr "Compreendendo o GNU Privacy Assistant"
 
-#: src/helpmenu.c:284
+#: src/icons.c:199
 #, fuzzy
-msgid "GPA is Free Software under the"
-msgstr "GPA é software livre distribuído sob a"
+msgid "_Verify"
+msgstr "Verificar"
 
-#: src/helpmenu.c:288
-msgid "GNU General Public License."
-msgstr "GNU General Public License"
+#: src/icons.c:200
+msgid "_Encrypt"
+msgstr "_Encriptar"
 
-#: src/helpmenu.c:292
-msgid "For news see:"
-msgstr "Para novidades ver:"
+#: src/icons.c:201
+#, fuzzy
+msgid "_Decrypt"
+msgstr "_Desencriptar"
 
-#: src/helpmenu.c:297
+#: src/icons.c:202
 #, fuzzy
-msgid "http://www.gpg4win.org"
-msgstr "http://www.gnupg.org"
+msgid "_Brief"
+msgstr "Resumido"
 
-#: src/helpmenu.c:299
-msgid "http://www.gnupg.org"
-msgstr "http://www.gnupg.org"
+#: src/icons.c:203
+#, fuzzy
+msgid "_Detailed"
+msgstr "Detalhado"
 
-#: src/helpmenu.c:382
+#: src/icons.c:204
 #, fuzzy
-msgid "GNU General Public License"
-msgstr "GNU General Public License"
+msgid "_Keyring Editor"
+msgstr "Editor do chaveiro digital"
 
-#: src/helpmenu.c:409
+#: src/icons.c:205
 #, fuzzy
-msgid "_GNU General Public License"
-msgstr "GNU General Public License"
+msgid "_Clipboard"
+msgstr "/Janelas/_Gerenciador de arquivos"
 
-#: src/helpmenu.c:436
-msgid "Show Help Text\n"
-msgstr "Mostrar o texto de ajuda\n"
+#: src/icons.c:206
+#, fuzzy
+msgid "_File Manager"
+msgstr "gerenciador de arquivos"
 
-#: src/helpmenu.c:444
-msgid "/_Help"
-msgstr "/_Ajuda"
-
-#: src/helpmenu.c:446
-msgid "/Help/_Contents"
-msgstr "/Ajuda/_Conteúdo"
-
-#: src/helpmenu.c:449
-msgid "/Help/_License"
-msgstr "/Ajuda/_Licença"
-
-#: src/helpmenu.c:450
-msgid "/Help/_About"
-msgstr "/Ajuda/So_bre"
-
 #: src/keydeletedlg.c:41
 msgid "Removing Secret Key"
 msgstr "Remover chave secreta"
@@ -1299,23 +1020,27 @@
 msgid "Are you sure you want to delete this key?"
 msgstr "Você está certo que deseja apagar esta chave?"
 
-#: src/keyeditdlg.c:149
+#: src/keyeditdlg.c:147
 msgid "Edit Key"
 msgstr "Editar a chave"
 
-#: src/keyeditdlg.c:165
+#: src/keyeditdlg.c:162
 msgid "Change _passphrase"
 msgstr "Mudar _senha"
 
-#: src/keyeditdlg.c:185
+#: src/keyeditdlg.c:182
 msgid "Change _expiration"
 msgstr "Mudar _expiração"
 
-#: src/keygendlg.c:58
+#: src/keygendlg.c:67
+msgid "You must enter a key size."
+msgstr ""
+
+#: src/keygendlg.c:72
 msgid "You must enter a User ID."
 msgstr ""
 
-#: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
+#: src/keygendlg.c:77 src/passwddlg.c:45
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -1323,7 +1048,7 @@
 "Na \"senha\" e \"Repetir a senha\",\n"
 "você deve usar a mesma senha."
 
-#: src/keygendlg.c:70 src/keygenwizard.c:314 src/passwddlg.c:52
+#: src/keygendlg.c:84 src/passwddlg.c:52
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1331,7 +1056,7 @@
 "Você não entrou com uma senha.\n"
 "É necessário proteger sua chave privada."
 
-#: src/keygendlg.c:83 src/keygenwizard.c:328 src/passwddlg.c:65
+#: src/keygendlg.c:97 src/passwddlg.c:65
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1343,23 +1068,25 @@
 "\n"
 "Por favor entre com uma nova senha."
 
-#: src/keygendlg.c:88 src/keygenwizard.c:333 src/passwddlg.c:70
+#: src/keygendlg.c:102 src/passwddlg.c:70
 msgid "_Enter new passphrase"
 msgstr "_Entre com uma nova senha"
 
-#: src/keygendlg.c:89 src/keygenwizard.c:334 src/passwddlg.c:71
+#: src/keygendlg.c:104 src/passwddlg.c:71
 msgid "Take this one _anyway"
 msgstr "_Use esta assim mesmo"
 
-#: src/keygendlg.c:144 src/keygenwizard.c:541
+#: src/keygendlg.c:150 src/keygenwizard.c:571 src/keygenwizard.c:584
+#: src/keygenwizard.c:594 src/keygenwizard.c:604 src/keygenwizard.c:616
+#: src/keygenwizard.c:633 src/keygenwizard.c:645
 msgid "Generate key"
 msgstr "Gerar chave"
 
-#: src/keygendlg.c:185
+#: src/keygendlg.c:177
 msgid "_Algorithm: "
 msgstr "_Algoritmo:"
 
-#: src/keygendlg.c:197
+#: src/keygendlg.c:192
 msgid "_Key size (bits): "
 msgstr "_Tamanho da chave (bits)"
 
@@ -1375,27 +1102,27 @@
 msgid "2048"
 msgstr "2048"
 
-#: src/keygendlg.c:216
+#: src/keygendlg.c:206
 msgid "_User ID: "
 msgstr "User _ID:"
 
-#: src/keygendlg.c:226
+#: src/keygendlg.c:217
 msgid "_Email: "
 msgstr "E-_Mail:"
 
-#: src/keygendlg.c:236
+#: src/keygendlg.c:226
 msgid "_Comment: "
 msgstr "C_omentário:"
 
-#: src/keygendlg.c:248
+#: src/keygendlg.c:235
 msgid "_Passphrase: "
 msgstr "Se_nha"
 
-#: src/keygendlg.c:260
+#: src/keygendlg.c:246
 msgid "_Repeat passphrase: "
 msgstr "_Repetir senha:"
 
-#: src/keygenwizard.c:152
+#: src/keygenwizard.c:172
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1407,19 +1134,16 @@
 "Seu nome fará parte da nova chave para permitir aos outros identificar mais "
 "facilmente as chaves."
 
-#: src/keygenwizard.c:157
+#: src/keygenwizard.c:175
 msgid "Your Name:"
 msgstr "Seu nome:"
 
-#: src/keygenwizard.c:170
-msgid "Please insert your name"
-msgstr "Por favor indique o seu nome"
-
-#: src/keygenwizard.c:183
+#: src/keygenwizard.c:211
+#, fuzzy
 msgid ""
 "Please insert your email address.\n"
 "\n"
-" Your email address will be part of the new key to make it easier for others "
+"Your email address will be part of the new key to make it easier for others "
 "to identify keys. If you have several email addresses, you can add further "
 "email adresses later."
 msgstr ""
@@ -1429,27 +1153,40 @@
 "pessoas a identificação mais fácil das chaves. Se você tem vários e-mails, "
 "será possível adicionar outros endereços mais tarde."
 
-#: src/keygenwizard.c:190
+#: src/keygenwizard.c:215
 msgid "Your Email Address:"
 msgstr "Seu e-mail:"
 
-#: src/keygenwizard.c:205
-msgid "Please insert your email address"
-msgstr "Por favor indique o seu e-mail"
-
-#: src/keygenwizard.c:239
+#: src/keygenwizard.c:319
 msgid "Please choose a passphrase for the new key."
 msgstr "Por favor escolha uma senha para esta nova chave."
 
-#: src/keygenwizard.c:248 src/passwddlg.c:108
+#: src/keygenwizard.c:326
+#, fuzzy
+msgid ""
+"In \"Passphrase\" and \"Repeat passphrase\", you must enter the same "
+"passphrase."
+msgstr ""
+"Na \"senha\" e \"Repetir a senha\",\n"
+"você deve usar a mesma senha."
+
+#: src/keygenwizard.c:335
+msgid "Warning: The passphrase you have entered is not very secure."
+msgstr ""
+
+#: src/keygenwizard.c:350
+msgid "Quality: "
+msgstr ""
+
+#: src/keygenwizard.c:358 src/passwddlg.c:111
 msgid "Passphrase: "
 msgstr "_Senha"
 
-#: src/keygenwizard.c:261 src/passwddlg.c:117
+#: src/keygenwizard.c:370 src/passwddlg.c:120
 msgid "Repeat Passphrase: "
 msgstr "Repetir a s_enha: "
 
-#: src/keygenwizard.c:358
+#: src/keygenwizard.c:412
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1461,15 +1198,15 @@
 "\n"
 "Você deseja criar uma cópia de backup?"
 
-#: src/keygenwizard.c:367
+#: src/keygenwizard.c:420
 msgid "Create _backup copy"
 msgstr "Criar uma _cópia de backup"
 
-#: src/keygenwizard.c:374 src/keyring.c:739 src/keyring.c:767
+#: src/keygenwizard.c:425 src/keyring.c:737 src/keyring.c:763
 msgid "Do it _later"
 msgstr "Fazê-lo mais _tarde"
 
-#: src/keygenwizard.c:402
+#: src/keygenwizard.c:454
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1480,7 +1217,7 @@
 "Mesmo em máquinas rápidas, isto pode demorar um pouco. Por favor seja "
 "paciente"
 
-#: src/keygenwizard.c:411
+#: src/keygenwizard.c:463
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1498,43 +1235,43 @@
 "This might take a few seconds."
 msgstr ""
 
-#: src/keylist.c:559
+#: src/keylist.c:547
 msgid ""
 "This columns lists the type of the certificate.  A 'P' denotes OpenPGP and a "
 "'X' denotes X.509 (S/MIME)."
 msgstr ""
 
-#: src/keylist.c:568
+#: src/keylist.c:556
 #, fuzzy
 msgid "The key ID is a short number to identify a certificate."
 msgstr "E não pode ser usada para encriptação."
 
-#: src/keylist.c:581
+#: src/keylist.c:569
 msgid "The Expiry Date is the date until the certificate is valid."
 msgstr ""
 
-#: src/keylist.c:591 src/ownertrustdlg.c:122
+#: src/keylist.c:579 src/ownertrustdlg.c:123
 msgid "Owner Trust"
 msgstr "Confiança no proprietário"
 
-#: src/keylist.c:592
+#: src/keylist.c:580
 msgid ""
 "The Owner Trust has been set by you and describes how far you trust the "
 "holder of the certificate to correctly sign (certify) other certificates.  "
 "It is only meaningful for OpenPGP."
 msgstr ""
 
-#: src/keylist.c:604
+#: src/keylist.c:592
 msgid "Validity"
 msgstr "Validade"
 
-#: src/keylist.c:605
+#: src/keylist.c:593
 msgid ""
 "The Validity describes the trust level the system has in this certificate.  "
 "That is how sure it is that the named user is actually that user."
 msgstr ""
 
-#: src/keylist.c:619
+#: src/keylist.c:607
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
@@ -1544,7 +1281,7 @@
 msgid "No keys selected for signing."
 msgstr "Nenhuma chave selecionada para assinar."
 
-#: src/keyring.c:734
+#: src/keyring.c:732
 msgid ""
 "You do not have a private key yet. Do you want to generate one now "
 "(recommended) or do it later?"
@@ -1552,11 +1289,11 @@
 "Você não tem ainda uma chave privada. Você desejar gerar uma agora "
 "(recomendado) ou fazê-lo mais tarde?"
 
-#: src/keyring.c:738
+#: src/keyring.c:736
 msgid "_Generate key now"
 msgstr "_Gerar chave agora"
 
-#: src/keyring.c:761
+#: src/keyring.c:757
 msgid ""
 "You do not have a backup copy of your private key yet. Do you want to backup "
 "your key now (recommended) or do it later?"
@@ -1564,346 +1301,248 @@
 "Você não tem uma cópia de backup de sua chave privada. Você quer fazer isso "
 "agora (recomendado) ou fazer mais tarde?"
 
-#: src/keyring.c:766
+#: src/keyring.c:762
 msgid "_Backup key now"
 msgstr "_Backup de chave agora"
 
-#: src/keyring.c:883
-msgid "/_Keys"
-msgstr "/_Chaves"
-
-#: src/keyring.c:884
-msgid "/Keys/_Refresh"
-msgstr ""
-
 #: src/keyring.c:886
 #, fuzzy
-msgid "/Keys/sep0"
-msgstr "/Chaves/sep1"
+msgid "_Keys"
+msgstr "/_Chaves"
 
 #: src/keyring.c:887
-msgid "/Keys/_New Key..."
-msgstr "/Chaves/_Nova Chave..."
+#, fuzzy
+msgid "_Server"
+msgstr "_Nunca"
 
-#: src/keyring.c:889
-msgid "/Keys/_Delete Keys..."
-msgstr "/Chaves/_Apagar Chaves..."
+#: src/keyring.c:901
+#, fuzzy
+msgid "Select all certificates"
+msgstr "Gerar certificado de revogação"
 
-#: src/keyring.c:891
-msgid "/Keys/sep1"
-msgstr "/Chaves/sep1"
+#: src/keyring.c:906
+#, fuzzy
+msgid "Refresh the keyring"
+msgstr "_Chaveiro de chaves secretas"
 
-#: src/keyring.c:892
-msgid "/Keys/_Sign Keys..."
-msgstr "/Chaves/_Assinar Chaves..."
+#: src/keyring.c:907
+#, fuzzy
+msgid "_New key..."
+msgstr "/Chaves/_Nova Chave..."
 
-#: src/keyring.c:893
-msgid "/Keys/Set _Owner Trust..."
-msgstr "/Chaves/A_lterar a confiabilidade..."
+#: src/keyring.c:908
+#, fuzzy
+msgid "Generate a new key"
+msgstr "Gerar chave"
 
-#: src/keyring.c:894
-msgid "/Keys/_Edit Private Key..."
-msgstr "/Chaves/_Editar Chave Privada..."
+#: src/keyring.c:909
+#, fuzzy
+msgid "_Delete keys"
+msgstr "/_Apagar Chaves..."
 
-#: src/keyring.c:895
-msgid "/Keys/sep2"
-msgstr "/Chaves/sep2"
+#: src/keyring.c:910
+msgid "Remove the selected key"
+msgstr "Remover a chave selecionada"
 
-#: src/keyring.c:896
-msgid "/Keys/_Import Keys..."
-msgstr "/Chaves/_Importar Chaves..."
+#: src/keyring.c:911
+#, fuzzy
+msgid "_Sign Keys..."
+msgstr "/A_ssinar Chaves..."
 
-#: src/keyring.c:897
-msgid "/Keys/E_xport Keys..."
-msgstr "/Chaves/_Exportar Chaves..."
+#: src/keyring.c:912
+msgid "Sign the selected key"
+msgstr "Assinar a chave selecionada"
 
-#: src/keyring.c:898
-msgid "/Keys/_Backup..."
-msgstr "/Chaves/_Backup..."
-
-#: src/keyring.c:901
+#: src/keyring.c:913
 #, fuzzy
-msgid "/_Server"
-msgstr "_Nunca"
+msgid "Set _Owner Trust..."
+msgstr "/A_lterar a confiabilidade..."
 
-#: src/keyring.c:902
+#: src/keyring.c:914
 #, fuzzy
-msgid "/Server/_Retrieve Keys..."
-msgstr "/Chaves/_Apagar Chaves..."
+msgid "Set owner trust of the selected key"
+msgstr "Remover a chave selecionada"
 
-#: src/keyring.c:903
+#: src/keyring.c:916
 #, fuzzy
-msgid "/Server/_Send Keys..."
-msgstr "/Chaves/_Assinar Chaves..."
+msgid "_Edit Private Key..."
+msgstr "/_Editar Chave Privada..."
 
-#: src/keyring.c:908
+#: src/keyring.c:917
+msgid "Edit the selected private key"
+msgstr "Editar a chave privada selecionada"
+
+#: src/keyring.c:919
 #, fuzzy
-msgid "/Windows/_File Manager"
-msgstr "/Janelas/_Gerenciador de arquivos"
+msgid "_Import Keys..."
+msgstr "Importar chaves"
 
-#: src/keyring.c:939
-msgid "/Keys/Export Keys..."
-msgstr "/Chaves/Exportar Chaves..."
+#: src/keyring.c:920
+msgid "Import Keys"
+msgstr "Importar chaves"
 
-#: src/keyring.c:944
-msgid "/Keys/Delete Keys..."
-msgstr "/Chaves/Apagar Chaves..."
-
-#: src/keyring.c:952
+#: src/keyring.c:921
 #, fuzzy
-msgid "/Server/Send Keys..."
-msgstr "/Chaves/Assinar Chaves..."
+msgid "E_xport Keys..."
+msgstr "/E_xportar Chaves..."
 
-#: src/keyring.c:959
-msgid "/Keys/Set Owner Trust..."
-msgstr "/Chaves/Alterar a confiabilidade..."
+#: src/keyring.c:922
+msgid "Export Keys"
+msgstr "Exportar Chaves"
 
-#: src/keyring.c:966
-msgid "/Keys/Sign Keys..."
-msgstr "/Chaves/Assinar Chaves..."
+#: src/keyring.c:923
+#, fuzzy
+msgid "_Backup..."
+msgstr "/_Backup..."
 
-#: src/keyring.c:972
-msgid "/Keys/Edit Private Key..."
-msgstr "/Chaves/Editar Chave Privada..."
+#: src/keyring.c:924
+#, fuzzy
+msgid "Backup key"
+msgstr "Backup de chaves"
 
-#: src/keyring.c:977
-msgid "/Keys/Backup..."
-msgstr "/Chaves/Backup..."
+#: src/keyring.c:927
+#, fuzzy
+msgid "_Retrieve Keys..."
+msgstr "/Chaves/_Apagar Chaves..."
 
-#: src/keyring.c:994
-msgid "/_Copy"
-msgstr "/_Copiar"
+#: src/keyring.c:928
+#, fuzzy
+msgid "Retrieve keys from server"
+msgstr "Receber chave de _servidor:"
 
-#: src/keyring.c:996
-msgid "/_Paste"
-msgstr "/C_olar"
-
-#: src/keyring.c:998
-msgid "/_Delete Keys..."
-msgstr "/_Apagar Chaves..."
-
-#: src/keyring.c:1001
-msgid "/_Sign Keys..."
+#: src/keyring.c:930
+#, fuzzy
+msgid "_Send Keys..."
 msgstr "/A_ssinar Chaves..."
 
-#: src/keyring.c:1002
-msgid "/Set _Owner Trust..."
-msgstr "/A_lterar a confiabilidade..."
+#: src/keyring.c:931
+#, fuzzy
+msgid "Send keys to server"
+msgstr "_Servidor de chave:"
 
-#: src/keyring.c:1003
-msgid "/_Edit Private Key..."
-msgstr "/_Editar Chave Privada..."
+#: src/keyring.c:937
+msgid "Show Brief Keylist"
+msgstr "Mostrar resumo da lista de chaves"
 
-#: src/keyring.c:1005
-msgid "/E_xport Keys..."
-msgstr "/E_xportar Chaves..."
+#: src/keyring.c:939
+msgid "Show Key Details"
+msgstr "Mostrar detalhes da chave"
 
-#: src/keyring.c:1006
-#, fuzzy
-msgid "/Se_nd Keys to Server..."
-msgstr "_Servidor de chave:"
+#: src/keyring.c:1063
+msgid "Edit"
+msgstr "Editar"
 
-#: src/keyring.c:1007
-msgid "/_Backup..."
-msgstr "/_Backup..."
+#: src/keyring.c:1065
+msgid "Delete"
+msgstr "_Apagar"
 
-#: src/keyring.c:1018
-msgid "/Set Owner Trust..."
-msgstr "/Alterar a confiabilidade..."
+#: src/keyring.c:1067
+msgid "Sign"
+msgstr "Assinar"
 
-#: src/keyring.c:1025
-msgid "/Sign Keys..."
-msgstr "/Assinar Chaves..."
+#: src/keyring.c:1069
+msgid "Export"
+msgstr "Exportar"
 
-#: src/keyring.c:1031
-msgid "/Edit Private Key..."
-msgstr "/Editar Chave Privada..."
+#: src/keyring.c:1071
+msgid "Import"
+msgstr "Importar"
 
-#: src/keyring.c:1036
-msgid "/Backup..."
-msgstr "/Backup..."
-
-#: src/keyring.c:1106
+#: src/keyring.c:1178
 msgid "Subkeys"
 msgstr ""
 
-#: src/keyring.c:1180 src/keysigndlg.c:110
+#: src/keyring.c:1252 src/keysigndlg.c:106
 msgid "Fingerprint:"
 msgstr "Impressão digital:"
 
-#: src/keyring.c:1182
+#: src/keyring.c:1254
 msgid "Expires at:"
 msgstr "Expira em:"
 
-#: src/keyring.c:1184
+#: src/keyring.c:1256
 msgid "Owner Trust:"
 msgstr "Confiança no proprietário:"
 
-#: src/keyring.c:1186
+#: src/keyring.c:1258
 msgid "Key Validity:"
 msgstr "Validade da chave:"
 
-#: src/keyring.c:1188
+#: src/keyring.c:1260
 msgid "Key Type:"
 msgstr "Tipo de chave:"
 
-#: src/keyring.c:1190
+#: src/keyring.c:1262
 msgid "Created at:"
 msgstr "Criada em:"
 
-#: src/keyring.c:1193
+#: src/keyring.c:1265
 msgid "Details"
 msgstr "Detalhes"
 
-#: src/keyring.c:1201
+#: src/keyring.c:1273
 msgid "Show signatures on user name:"
 msgstr "Mostrar assinaturas no nome do usuário:"
 
-#: src/keyring.c:1225
+#: src/keyring.c:1298
 msgid "Signatures"
 msgstr "Assinaturas"
 
-#: src/keyring.c:1249
+#: src/keyring.c:1322
 msgid "The key has both a private and a public part"
 msgstr "A chave tem ao mesmo tempo uma parte privada e pública"
 
-#: src/keyring.c:1252
+#: src/keyring.c:1325
 msgid "The key has only a public part"
 msgstr "A chave tem apenas uma parte pública"
 
-#: src/keyring.c:1287
+#: src/keyring.c:1360
 #, fuzzy, c-format
 msgid "%s %u bits"
 msgstr "%s %li bits"
 
-#: src/keyring.c:1312
+#: src/keyring.c:1385
 msgid "No keys selected"
 msgstr "Nenhuma chave selecionada"
 
-#: src/keyring.c:1315
+#: src/keyring.c:1388
 #, fuzzy, c-format
 msgid "%d key selected"
 msgid_plural "%d keys selected"
 msgstr[0] "%d chaves selecionadas"
 msgstr[1] "%d chaves selecionadas"
 
-#: src/keyring.c:1347
+#: src/keyring.c:1423
 msgid "All signatures"
 msgstr "Todas as assinaturas"
 
-#: src/keyring.c:1552
-msgid "Edit"
-msgstr "Editar"
-
-#: src/keyring.c:1553
-msgid "Edit the selected private key"
-msgstr "Editar a chave privada selecionada"
-
-#: src/keyring.c:1554
-msgid "edit key"
-msgstr "editar chave"
-
-#: src/keyring.c:1562
-msgid "Remove the selected key"
-msgstr "Remover a chave selecionada"
-
-#: src/keyring.c:1563
-msgid "remove key"
-msgstr "remover a chave"
-
-#: src/keyring.c:1571
-msgid "Sign the selected key"
-msgstr "Assinar a chave selecionada"
-
-#: src/keyring.c:1571
-msgid "sign key"
-msgstr "assinar chave"
-
 #: src/keyring.c:1578
-msgid "Import"
-msgstr "Importar"
-
-#: src/keyring.c:1579
-msgid "Import Keys"
-msgstr "Importar chaves"
-
-#: src/keyring.c:1579
-msgid "import keys"
-msgstr "importar chaves"
-
-#: src/keyring.c:1584
-msgid "Export"
-msgstr "Exportar"
-
-#: src/keyring.c:1585
-msgid "Export Keys"
-msgstr "Exportar Chaves"
-
-#: src/keyring.c:1585
-msgid "export keys"
-msgstr "exportar chaves"
-
-#: src/keyring.c:1598
-msgid "Brief"
-msgstr "Resumido"
-
-#: src/keyring.c:1598
-msgid "Show Brief Keylist"
-msgstr "Mostrar resumo da lista de chaves"
-
-#: src/keyring.c:1599
-msgid "brief"
-msgstr "resumido"
-
-#: src/keyring.c:1610
-msgid "Detailed"
-msgstr "Detalhado"
-
-#: src/keyring.c:1610
-msgid "Show Key Details"
-msgstr "Mostrar detalhes da chave"
-
-#: src/keyring.c:1611
-msgid "detailed"
-msgstr "detalhado"
-
-#: src/keyring.c:1639
 #, fuzzy
-msgid "Refresh the keyring"
-msgstr "_Chaveiro de chaves secretas"
-
-#: src/keyring.c:1640
-#, fuzzy
-msgid "refresh keyring"
-msgstr "_Chaveiro de chaves secretas"
-
-#: src/keyring.c:1711
-#, fuzzy
 msgid "Selected default key:"
 msgstr "Chave default selecionada:"
 
-#: src/keyring.c:1721
+#: src/keyring.c:1588
 #, fuzzy
 msgid "No default key selected in the preferences."
 msgstr "Nenhum arquivo selecionado para ser protegido"
 
-#: src/keyring.c:1833
+#: src/keyring.c:1701
 msgid "GNU Privacy Assistant - Keyring Editor"
 msgstr "GNU Privacy Assistant - Editor do chaveiro digital"
 
-#: src/keyring.c:1865
+#: src/keyring.c:1728
 msgid "Keyring Editor"
 msgstr "Editor do chaveiro digital"
 
-#: src/keysigndlg.c:60
+#: src/keysigndlg.c:59
 msgid "Sign Key"
 msgstr "Assinar chave"
 
-#: src/keysigndlg.c:76
+#: src/keysigndlg.c:72
 msgid "Do you want to sign the following key?"
 msgstr "Você deseja assinar as chaves seguintes?"
 
-#: src/keysigndlg.c:120
+#: src/keysigndlg.c:116
 msgid ""
 "Check the name and fingerprint carefully to be sure that it really is the "
 "key you want to sign."
@@ -1911,19 +1550,19 @@
 "Verifique o nome e a impressão digital meticulosamente para estar certo que "
 "é realmente a chave que você deseja assinar."
 
-#: src/keysigndlg.c:128
+#: src/keysigndlg.c:124
 msgid "All user names in this key will be signed."
 msgstr "Todos os nomes de usuários serão assinados."
 
-#: src/keysigndlg.c:134
+#: src/keysigndlg.c:130
 msgid "The key will be signed with your default private key."
 msgstr "A chave será assinada com a sua chave privada padrão"
 
-#: src/keysigndlg.c:141
+#: src/keysigndlg.c:137
 msgid "Sign only _locally"
 msgstr "Assinar apenas _localmente"
 
-#: src/options.c:316
+#: src/options.c:323
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -1931,26 +1570,26 @@
 "A chave privada que você escolheu como default não é mais válida. \n"
 "O GPA tentará escolher uma nova chave default automaticamente."
 
-#: src/ownertrustdlg.c:106
+#: src/ownertrustdlg.c:107
 msgid "Change key ownertrust"
 msgstr "Alterar a confiabilidade na chave"
 
-#: src/ownertrustdlg.c:130
+#: src/ownertrustdlg.c:131
 msgid "_Unknown"
 msgstr "_Desconhecido"
 
-#: src/ownertrustdlg.c:135
+#: src/ownertrustdlg.c:136
 msgid ""
 "You don't know how much to trust this user to verify other people's keys.\n"
 msgstr ""
 "Você não conhece o grau de confiabilidade deste usuário para verificar as "
 "outras chaves pessoais.\n"
 
-#: src/ownertrustdlg.c:145
+#: src/ownertrustdlg.c:146
 msgid "_Never"
 msgstr "_Nunca"
 
-#: src/ownertrustdlg.c:150
+#: src/ownertrustdlg.c:151
 msgid ""
 "You don't trust this user at all to verify the validity of other people's "
 "keys at all.\n"
@@ -1959,11 +1598,11 @@
 "validade das outras\n"
 "chaves pessoais.\n"
 
-#: src/ownertrustdlg.c:160
+#: src/ownertrustdlg.c:161
 msgid "_Marginal"
 msgstr "_Moderado"
 
-#: src/ownertrustdlg.c:165
+#: src/ownertrustdlg.c:166
 msgid ""
 "You don't trust this user's ability to verify the validity of other people's "
 "keys enough to consider keys valid based on his/her sole word.\n"
@@ -1980,11 +1619,11 @@
 "outros \n"
 "usuários com pouca ou moderada confiança e com chaves válidas\n"
 
-#: src/ownertrustdlg.c:182
+#: src/ownertrustdlg.c:183
 msgid "_Full"
 msgstr "_Completo"
 
-#: src/ownertrustdlg.c:187
+#: src/ownertrustdlg.c:188
 msgid ""
 "You trust this user's ability to verify the validity of other people's keys "
 "so much, that you'll consider valid any key signed by him/her, provided this "
@@ -1995,11 +1634,11 @@
 "por ele/ela \n"
 "assinado(a), contanto que esta chave do usuário seja válida. \n"
 
-#: src/ownertrustdlg.c:200
+#: src/ownertrustdlg.c:201
 msgid "U_ltimate"
 msgstr "Comp_letamente"
 
-#: src/ownertrustdlg.c:205
+#: src/ownertrustdlg.c:206
 msgid ""
 "You consider this key valid, and trust the user so much that you will "
 "consider any key signed by him/her fully valid.\n"
@@ -2090,38 +1729,148 @@
 "Não há um plugin disponível para o servidor de chaves\n"
 "com o protocolo especificado."
 
-#: src/server_access.c:528 src/server_access.c:574
+#: src/server_access.c:528 src/server_access.c:572
 msgid "The keyserver you specified is not valid"
 msgstr "O servidor de chaves especificado não é válido"
 
-#: src/settingsdlg.c:59
+#: src/settingsdlg.c:133 src/siglist.c:135
+msgid "Local"
+msgstr ""
+
+#: src/settingsdlg.c:134
 #, fuzzy
+msgid "Local, Keyserver"
+msgstr "_Servidor de chaves"
+
+#: src/settingsdlg.c:135
+msgid "Local, PKA"
+msgstr ""
+
+#: src/settingsdlg.c:136
+msgid "Local, PKA, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:137
+msgid "Local, Keyserver, PKA"
+msgstr ""
+
+#: src/settingsdlg.c:138
+msgid "Local, kDNS"
+msgstr ""
+
+#: src/settingsdlg.c:139
+msgid "Local, kDNS, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:140
+msgid "PKA"
+msgstr ""
+
+#: src/settingsdlg.c:141
+msgid "kDNS"
+msgstr ""
+
+#: src/settingsdlg.c:142
+msgid "Custom"
+msgstr ""
+
+#: src/settingsdlg.c:208
+#, fuzzy
+msgid "<b>User interface</b>"
+msgstr "Usar modo _avançado:"
+
+#: src/settingsdlg.c:215
+#, fuzzy
+msgid "Use _advanced mode"
+msgstr "Usar modo _avançado:"
+
+#: src/settingsdlg.c:221
+#, fuzzy
+msgid "Show advanced _options"
+msgstr "Mostrar detalhes da chave"
+
+#: src/settingsdlg.c:272
+msgid ""
+"No default key has been selected.  This may lead to problems when signing or "
+"encrypting.  For example you might later not be able to read a mail written "
+"by you and encrypted to someone else.\n"
+"\n"
+"Please consider creating your own key and select it then."
+msgstr ""
+
+#: src/settingsdlg.c:278
+msgid "Continue without a default key"
+msgstr ""
+
+#: src/settingsdlg.c:280
+#, fuzzy
+msgid "Let me select a default key"
+msgstr "Chave default selecionada:"
+
+#: src/settingsdlg.c:305
+#, fuzzy
 msgid "<b>Default _key</b>"
 msgstr "Chave _padrão (default key):"
 
-#: src/settingsdlg.c:111
+#: src/settingsdlg.c:405
 #, fuzzy
 msgid "<b>Default key_server</b>"
 msgstr "Servidor de chaves _padrão:"
 
-#: src/settingsdlg.c:158
+#: src/settingsdlg.c:602
 #, fuzzy
-msgid "<b>Use _advanced mode</b>"
-msgstr "Usar modo _avançado:"
+msgid "<b>Auto key _locate</b>"
+msgstr "Servidor de chaves _padrão:"
 
-#: src/settingsdlg.c:193
-msgid "Settings"
-msgstr "Configuração"
+#: src/settingsdlg.c:612
+msgid ""
+"The list of methods to locate keys via an email address.\n"
+"All given methods are used in turn until a matching key is found.  The "
+"supported methods are:\n"
+" Local\n"
+"   - Use the local keyring.\n"
+" Keyserver\n"
+"   - Use the default keyserver.\n"
+" PKA\n"
+"   - Use the Public Key Association.\n"
+" kDNS\n"
+"   - Use kDNS with the nameserver below.\n"
+" Custom\n"
+"   - Configured in the backend dialog.\n"
+msgstr ""
 
+#: src/settingsdlg.c:627
+msgid "Method:"
+msgstr ""
+
+#: src/settingsdlg.c:644
+msgid "The IP address of the nameserver used for the kDNS method."
+msgstr ""
+
+#: src/settingsdlg.c:646
+#, fuzzy
+msgid "kDNS Server:"
+msgstr "_Nunca"
+
+#: src/settingsdlg.c:740
+#, fuzzy
+msgid "The URL given for the keyserver is not valid."
+msgstr "O servidor de chaves especificado não é válido"
+
+#: src/settingsdlg.c:749
+msgid "The data given for \"Auto key locate\" is not valid."
+msgstr ""
+
+#: src/settingsdlg.c:886
+#, fuzzy
+msgid "GNU Privacy Assistant - Settings"
+msgstr "GNU Privacy Assistant - Editor do chaveiro digital"
+
 #: src/siglist.c:128
 #, fuzzy
 msgid "Level"
 msgstr "Nunca"
 
-#: src/siglist.c:135
-msgid "Local"
-msgstr ""
-
 #: src/verifydlg.c:116
 #, fuzzy
 msgid "Verify documents"
@@ -2149,6 +1898,367 @@
 msgid "Signatures:"
 msgstr "Assinaturas:"
 
+#, fuzzy
+#~ msgid "/File/C_lear"
+#~ msgstr "/Arquivo/_Fechar"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Arquivo/_Abrir"
+
+#, fuzzy
+#~ msgid "/File/Save _As"
+#~ msgstr "/Arquivo/_Fechar"
+
+#~ msgid "/File/sep1"
+#~ msgstr "/Arquivo/sep1"
+
+#~ msgid "/File/_Sign"
+#~ msgstr "/Arquivo/A_ssinar"
+
+#~ msgid "/File/_Verify"
+#~ msgstr "/Arquivo/_Verificar"
+
+#~ msgid "/File/_Encrypt"
+#~ msgstr "/Arquivo/En_criptar"
+
+#~ msgid "/File/_Decrypt"
+#~ msgstr "/Arquivo/_Desencriptar"
+
+#~ msgid "/File/sep2"
+#~ msgstr "/Arquivo/sep2"
+
+#~ msgid "/File/_Close"
+#~ msgstr "/Arquivo/_Fechar"
+
+#~ msgid "/File/_Quit"
+#~ msgstr "/Arquivo/Sai_r"
+
+#, fuzzy
+#~ msgid "/Edit/_Undo"
+#~ msgstr "/Editar/_Copiar"
+
+#, fuzzy
+#~ msgid "/Edit/_Redo"
+#~ msgstr "/Editar/_Copiar"
+
+#, fuzzy
+#~ msgid "/Edit/sep0"
+#~ msgstr "/Editar/sep2"
+
+#, fuzzy
+#~ msgid "/Edit/Cut"
+#~ msgstr "/Editar/Copiar"
+
+#~ msgid "/Edit/_Copy"
+#~ msgstr "/Editar/_Copiar"
+
+#~ msgid "/Edit/_Paste"
+#~ msgstr "/Editar/C_olar"
+
+#, fuzzy
+#~ msgid "/Edit/_Delete"
+#~ msgstr "/Editar/C_olar"
+
+#~ msgid "/Edit/sep1"
+#~ msgstr "/Editar/sep1"
+
+#~ msgid "/Edit/Select _All"
+#~ msgstr "/Editar/Selecionar _Tudo"
+
+#~ msgid "/Edit/sep2"
+#~ msgstr "/Editar/sep2"
+
+#~ msgid "/Edit/Pr_eferences..."
+#~ msgstr "/Editar/Pr_eferências..."
+
+#, fuzzy
+#~ msgid "/Edit/_Backend Preferences..."
+#~ msgstr "/Editar/Pr_eferências..."
+
+#~ msgid "/_Windows"
+#~ msgstr "/_Janelas"
+
+#~ msgid "/Windows/_Keyring Editor"
+#~ msgstr "/Janelas/_Editor do chaveiro"
+
+#~ msgid "/Windows/_Filemanager"
+#~ msgstr "/Janelas/_Gerenciador de arquivos"
+
+#~ msgid "/Edit/Copy"
+#~ msgstr "/Editar/Copiar"
+
+#, fuzzy
+#~ msgid "/Edit/Delete"
+#~ msgstr "/Editar/Selecionar _Tudo"
+
+#, fuzzy
+#~ msgid "/Edit/Paste"
+#~ msgstr "/Editar/C_olar"
+
+#~ msgid "open file"
+#~ msgstr "abrir um arquivo"
+
+#, fuzzy
+#~ msgid "save file as"
+#~ msgstr "Gravar o arquivo _como"
+
+#, fuzzy
+#~ msgid "cut the selection"
+#~ msgstr "Encriptar o arquivo selecionado"
+
+#, fuzzy
+#~ msgid "copy the selection"
+#~ msgstr "Encriptar o arquivo selecionado"
+
+#, fuzzy
+#~ msgid "paste the clipboard"
+#~ msgstr "I_mportar do arquivo:"
+
+#, fuzzy
+#~ msgid "Sign the selected text"
+#~ msgstr "Assinar a chave selecionada"
+
+#, fuzzy
+#~ msgid "verify text"
+#~ msgstr "verificar arquivo"
+
+#~ msgid "Encrypt"
+#~ msgstr "Encriptar"
+
+#, fuzzy
+#~ msgid "encrypt text"
+#~ msgstr "encriptar arquivo"
+
+#, fuzzy
+#~ msgid "decrypt text"
+#~ msgstr "desencriptar arquivo"
+
+#~ msgid "preferences"
+#~ msgstr "preferências"
+
+#, fuzzy
+#~ msgid "Open the keyring editor"
+#~ msgstr "abre editor do chaveiro digital (padrão)"
+
+#, fuzzy
+#~ msgid "keyring editor"
+#~ msgstr "Editor do chaveiro digital"
+
+#, fuzzy
+#~ msgid "Open the file manager"
+#~ msgstr "Abrir Gerenciador de arquivos"
+
+#~ msgid "file manager"
+#~ msgstr "gerenciador de arquivos"
+
+#~ msgid "Help"
+#~ msgstr "Ajuda"
+
+#~ msgid "help"
+#~ msgstr "ajuda"
+
+#, fuzzy
+#~ msgid "/File/Sign"
+#~ msgstr "/Arquivo/A_ssinar"
+
+#, fuzzy
+#~ msgid "/File/Verify"
+#~ msgstr "/Arquivo/_Verificar"
+
+#, fuzzy
+#~ msgid "/File/Encrypt"
+#~ msgstr "/Arquivo/En_criptar"
+
+#, fuzzy
+#~ msgid "/File/Decrypt"
+#~ msgstr "/Arquivo/_Desencriptar"
+
+#, fuzzy
+#~ msgid "close files"
+#~ msgstr "abrir um arquivo"
+
+#~ msgid "sign file"
+#~ msgstr "assinar arquivo"
+
+#~ msgid "verify file"
+#~ msgstr "verificar arquivo"
+
+#~ msgid "encrypt file"
+#~ msgstr "encriptar arquivo"
+
+#~ msgid "decrypt file"
+#~ msgstr "desencriptar arquivo"
+
+#, fuzzy
+#~ msgid "Open the clipboard"
+#~ msgstr "Abrir Gerenciador de arquivos"
+
+#~ msgid "_Backup to file:"
+#~ msgstr "E_xportar para o arquivo:"
+
+#~ msgid "B_rowse..."
+#~ msgstr "I_nvestigar..."
+
+#, fuzzy
+#~ msgid "_Back"
+#~ msgstr "/_Backup..."
+
+#~ msgid "Brought to you by:"
+#~ msgstr "Criado para você por"
+
+#, fuzzy
+#~ msgid "GPA is Free Software under the"
+#~ msgstr "GPA é software livre distribuído sob a"
+
+#~ msgid "GNU General Public License."
+#~ msgstr "GNU General Public License"
+
+#~ msgid "For news see:"
+#~ msgstr "Para novidades ver:"
+
+#, fuzzy
+#~ msgid "http://www.gpg4win.org"
+#~ msgstr "http://www.gnupg.org"
+
+#~ msgid "http://www.gnupg.org"
+#~ msgstr "http://www.gnupg.org"
+
+#, fuzzy
+#~ msgid "GNU General Public License"
+#~ msgstr "GNU General Public License"
+
+#, fuzzy
+#~ msgid "_GNU General Public License"
+#~ msgstr "GNU General Public License"
+
+#~ msgid "Show Help Text\n"
+#~ msgstr "Mostrar o texto de ajuda\n"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Ajuda"
+
+#~ msgid "/Help/_Contents"
+#~ msgstr "/Ajuda/_Conteúdo"
+
+#~ msgid "/Help/_License"
+#~ msgstr "/Ajuda/_Licença"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/Ajuda/So_bre"
+
+#~ msgid "Please insert your name"
+#~ msgstr "Por favor indique o seu nome"
+
+#~ msgid "Please insert your email address"
+#~ msgstr "Por favor indique o seu e-mail"
+
+#, fuzzy
+#~ msgid "/Keys/sep0"
+#~ msgstr "/Chaves/sep1"
+
+#~ msgid "/Keys/_Delete Keys..."
+#~ msgstr "/Chaves/_Apagar Chaves..."
+
+#~ msgid "/Keys/sep1"
+#~ msgstr "/Chaves/sep1"
+
+#~ msgid "/Keys/_Sign Keys..."
+#~ msgstr "/Chaves/_Assinar Chaves..."
+
+#~ msgid "/Keys/Set _Owner Trust..."
+#~ msgstr "/Chaves/A_lterar a confiabilidade..."
+
+#~ msgid "/Keys/_Edit Private Key..."
+#~ msgstr "/Chaves/_Editar Chave Privada..."
+
+#~ msgid "/Keys/sep2"
+#~ msgstr "/Chaves/sep2"
+
+#~ msgid "/Keys/_Import Keys..."
+#~ msgstr "/Chaves/_Importar Chaves..."
+
+#~ msgid "/Keys/E_xport Keys..."
+#~ msgstr "/Chaves/_Exportar Chaves..."
+
+#~ msgid "/Keys/_Backup..."
+#~ msgstr "/Chaves/_Backup..."
+
+#, fuzzy
+#~ msgid "/Server/_Send Keys..."
+#~ msgstr "/Chaves/_Assinar Chaves..."
+
+#, fuzzy
+#~ msgid "/Windows/_File Manager"
+#~ msgstr "/Janelas/_Gerenciador de arquivos"
+
+#~ msgid "/Keys/Export Keys..."
+#~ msgstr "/Chaves/Exportar Chaves..."
+
+#~ msgid "/Keys/Delete Keys..."
+#~ msgstr "/Chaves/Apagar Chaves..."
+
+#, fuzzy
+#~ msgid "/Server/Send Keys..."
+#~ msgstr "/Chaves/Assinar Chaves..."
+
+#~ msgid "/Keys/Set Owner Trust..."
+#~ msgstr "/Chaves/Alterar a confiabilidade..."
+
+#~ msgid "/Keys/Sign Keys..."
+#~ msgstr "/Chaves/Assinar Chaves..."
+
+#~ msgid "/Keys/Edit Private Key..."
+#~ msgstr "/Chaves/Editar Chave Privada..."
+
+#~ msgid "/Keys/Backup..."
+#~ msgstr "/Chaves/Backup..."
+
+#~ msgid "/_Copy"
+#~ msgstr "/_Copiar"
+
+#~ msgid "/_Paste"
+#~ msgstr "/C_olar"
+
+#~ msgid "/Set Owner Trust..."
+#~ msgstr "/Alterar a confiabilidade..."
+
+#~ msgid "/Sign Keys..."
+#~ msgstr "/Assinar Chaves..."
+
+#~ msgid "/Edit Private Key..."
+#~ msgstr "/Editar Chave Privada..."
+
+#~ msgid "/Backup..."
+#~ msgstr "/Backup..."
+
+#~ msgid "edit key"
+#~ msgstr "editar chave"
+
+#~ msgid "remove key"
+#~ msgstr "remover a chave"
+
+#~ msgid "sign key"
+#~ msgstr "assinar chave"
+
+#~ msgid "import keys"
+#~ msgstr "importar chaves"
+
+#~ msgid "export keys"
+#~ msgstr "exportar chaves"
+
+#~ msgid "brief"
+#~ msgstr "resumido"
+
+#~ msgid "detailed"
+#~ msgstr "detalhado"
+
+#, fuzzy
+#~ msgid "refresh keyring"
+#~ msgstr "_Chaveiro de chaves secretas"
+
+#~ msgid "Settings"
+#~ msgstr "Configuração"
+
 #~ msgid "Sign files"
 #~ msgstr "Arquivo assinado"
 
@@ -2208,9 +2318,6 @@
 #~ msgid "E_xport to file:"
 #~ msgstr "E_xportar para o arquivo:"
 
-#~ msgid "_Key server:"
-#~ msgstr "_Servidor de chaves"
-
 #~ msgid "Import Key"
 #~ msgstr "Importar chave"
 
@@ -2293,9 +2400,6 @@
 #~ msgid "The currently selected filename."
 #~ msgstr "O seguinte arquivo selecionado."
 
-#~ msgid "Show file operations"
-#~ msgstr "Mostrar detalhes da chave"
-
 #~ msgid "Whether buttons for creating/manipulating files should be displayed."
 #~ msgstr "Se os botões para criar/manipular arquivos devem ser mostrados."
 
@@ -2402,9 +2506,6 @@
 #~ msgid "_Delete"
 #~ msgstr "_Apagar"
 
-#~ msgid "Delete"
-#~ msgstr "_Apagar"
-
 #~ msgid ""
 #~ "The file name \"%s\" contains symbols that are not allowed in filenames"
 #~ msgstr ""
@@ -2541,10 +2642,6 @@
 #~ "no momento de exportar as chaves secretas."
 
 #, fuzzy
-#~ msgid "Receive key from server"
-#~ msgstr "Receber chave de _servidor:"
-
-#, fuzzy
 #~ msgid "_Key ID: "
 #~ msgstr "Key ID:"
 
@@ -2666,9 +2763,6 @@
 #~ msgid "Save encrypted file as"
 #~ msgstr "Gravar o arquivo encriptado como"
 
-#~ msgid "_Encrypt"
-#~ msgstr "_Encriptar"
-
 #~ msgid "Protect files by Password"
 #~ msgstr "Arquivo protegido por senha"
 
@@ -2819,9 +2913,6 @@
 #~ "Não há chave selecionada para criar um certificado de revogação desta "
 #~ "chave"
 
-#~ msgid "Generate revocation certificate"
-#~ msgstr "Gerar certificado de revogação"
-
 #~ msgid "Import keys"
 #~ msgstr "Importar chaves"
 

Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/ru.po	2008-05-08 12:53:41 UTC (rev 891)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.8\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-03-20 22:28+0100\n"
+"POT-Creation-Date: 2008-05-08 14:51+0200\n"
 "PO-Revision-Date: 2008-03-18 20:12+0300\n"
 "Last-Translator: Sergei Smirnov <moscow at hro.org>\n"
 "Language-Team: Russian <moscow at hro.org>\n"
@@ -18,332 +18,152 @@
 "X-Poedit-Language: Russian\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 
-#: src/clipboard.c:381 src/fileman.c:393
+#: src/clipboard.c:376 src/fileman.c:392
 msgid "Open File"
 msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»"
 
-#: src/clipboard.c:409 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ðµ GPA"
 
 #. TRANSLATORS: The arguments are the filename, the integer size
 #. and the unit (such as KB or MB).
-#: src/clipboard.c:426
+#: src/clipboard.c:421
 #, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
 msgstr "Ð¤Ð°Ð¹Ð» %s Ð¾Ñ‡ÐµÐ½ÑŒ (%lli%s) Ð²ÐµÐ»Ð¸Ðº. Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÐµÐ³Ð¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ?"
 
-#: src/clipboard.c:547
+#: src/clipboard.c:542
 msgid "Save As..."
 msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ ÐºÐ°Ðº..."
 
-#: src/clipboard.c:588 src/clipboard.c:618 src/clipboard.c:648
-#: src/clipboard.c:678 src/clipboard.c:1184 src/fileman.c:716
-#: src/keyring.c:1657
+#: src/clipboard.c:583 src/clipboard.c:613 src/clipboard.c:643
+#: src/clipboard.c:673 src/clipboard.c:1034
 msgid "Clipboard"
 msgstr "Ð‘ÑƒÑ„ÐµÑ€"
 
-#: src/clipboard.c:758 src/fileman.c:513 src/keyring.c:863
-msgid "/_File"
+#: src/clipboard.c:755 src/fileman.c:515 src/keyring.c:884
+#, fuzzy
+msgid "_File"
 msgstr "/_Ð¤Ð°Ð¹Ð»"
 
-#: src/clipboard.c:759 src/fileman.c:515
-msgid "/File/C_lear"
-msgstr "/Ð¤Ð°Ð¹Ð»/Ðž_Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ"
-
-#: src/clipboard.c:760 src/fileman.c:514
-msgid "/File/_Open"
-msgstr "/Ð¤Ð°Ð¹Ð»/_ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ"
-
-#: src/clipboard.c:761
-msgid "/File/Save _As"
-msgstr "/Ð¤Ð°Ð¹Ð»/Ð¡Ð¾_Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ ÐºÐ°Ðº"
-
-#: src/clipboard.c:763 src/fileman.c:516
-msgid "/File/sep1"
-msgstr "/Ð¤Ð°Ð¹Ð»/sep1"
-
-#: src/clipboard.c:764 src/fileman.c:517
-msgid "/File/_Sign"
-msgstr "/Ð¤Ð°Ð¹Ð»/_ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ"
-
-#: src/clipboard.c:765 src/fileman.c:518
-msgid "/File/_Verify"
-msgstr "/Ð¤Ð°Ð¹Ð»/ÐŸÑ€Ð¾Ð²_ÐµÑ€Ð¸Ñ‚ÑŒ"
-
-#: src/clipboard.c:766 src/fileman.c:519
-msgid "/File/_Encrypt"
-msgstr "/Ð¤Ð°Ð¹Ð»/_Ð—Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
-
-#: src/clipboard.c:767 src/fileman.c:520
-msgid "/File/_Decrypt"
-msgstr "/Ð¤Ð°Ð¹Ð»/_Ð Ð°ÑÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
-
-#: src/clipboard.c:768 src/fileman.c:521
-msgid "/File/sep2"
-msgstr "/Ð¤Ð°Ð¹Ð»/sep2"
-
-#: src/clipboard.c:769 src/fileman.c:522 src/keyring.c:864
-msgid "/File/_Close"
-msgstr "/Ð¤Ð°Ð¹Ð»/Ð—Ð°_ÐºÑ€Ñ‹Ñ‚ÑŒ"
-
-#: src/clipboard.c:770 src/fileman.c:523 src/keyring.c:866
-msgid "/File/_Quit"
-msgstr "/Ð¤Ð°Ð¹Ð»/_Ð’Ñ‹Ð¹Ñ‚Ð¸"
-
-#: src/clipboard.c:773 src/fileman.c:526 src/keyring.c:869
-msgid "/_Edit"
+#: src/clipboard.c:756 src/fileman.c:516 src/keyring.c:885
+#, fuzzy
+msgid "_Edit"
 msgstr "/_ÐŸÑ€Ð°Ð²ÐºÐ°"
 
-#: src/clipboard.c:776
-msgid "/Edit/_Undo"
-msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
+#: src/clipboard.c:760
+msgid "Clear buffer"
+msgstr "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ Ð±ÑƒÑ„ÐµÑ€"
 
-#: src/clipboard.c:777
-msgid "/Edit/_Redo"
-msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/Ð’_ÐµÑ€Ð½ÑƒÑ‚ÑŒ"
+#: src/clipboard.c:762 src/fileman.c:520
+msgid "Open a file"
+msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»"
 
-#: src/clipboard.c:778
-msgid "/Edit/sep0"
-msgstr "/Edit/sep0"
+#: src/clipboard.c:764
+msgid "Save to a file"
+msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð² Ñ„Ð°Ð¹Ð»Ðµ"
 
-#: src/clipboard.c:780 src/clipboard.c:816
-msgid "/Edit/Cut"
-msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/Ð’Ñ‹Ñ€ÐµÐ·Ð°Ñ‚ÑŒ"
+#: src/clipboard.c:766
+#, fuzzy
+msgid "Sign buffer text"
+msgstr "Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ñ‚ÐµÐºÑÑ‚"
 
-#: src/clipboard.c:781 src/keyring.c:870
-msgid "/Edit/_Copy"
-msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
+#: src/clipboard.c:768
+#, fuzzy
+msgid "Check signatures of buffer text"
+msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñ‚ÐµÐºÑÑ‚Ð°"
 
-#: src/clipboard.c:782 src/keyring.c:872
-msgid "/Edit/_Paste"
-msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_Ð’ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ"
+#: src/clipboard.c:770
+#, fuzzy
+msgid "Encrypt the buffer text"
+msgstr "Ð—Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ Ñ‚ÐµÐºÑÑ‚"
 
-#: src/clipboard.c:783
-msgid "/Edit/_Delete"
-msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
+#: src/clipboard.c:772
+#, fuzzy
+msgid "Decrypt the buffer text"
+msgstr "Ð Ð°ÑÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ Ñ‚ÐµÐºÑÑ‚"
 
-#: src/clipboard.c:784 src/keyring.c:874
-msgid "/Edit/sep1"
-msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/sep1"
-
-#: src/clipboard.c:785 src/fileman.c:527 src/keyring.c:875
-msgid "/Edit/Select _All"
-msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/Ð’Ñ‹_Ð±Ñ€Ð°Ñ‚ÑŒ Ð²ÑÐµ"
-
-#: src/clipboard.c:787 src/fileman.c:528 src/keyring.c:876
-msgid "/Edit/sep2"
-msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/sep2"
-
-#: src/clipboard.c:788 src/fileman.c:529 src/keyring.c:877
-msgid "/Edit/Pr_eferences..."
-msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸..."
-
-#: src/clipboard.c:790 src/fileman.c:531 src/keyring.c:879
-msgid "/Edit/_Backend Preferences..."
-msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ _ÑˆÐ¸Ñ„Ñ€. Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹..."
-
-#: src/clipboard.c:794 src/fileman.c:535 src/keyring.c:906
-msgid "/_Windows"
-msgstr "/_ÐžÐºÐ½Ð¾"
-
-#: src/clipboard.c:795 src/fileman.c:536 src/keyring.c:907
-msgid "/Windows/_Keyring Editor"
-msgstr "/ÐžÐºÐ½Ð¾/ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ _ÐºÐ»ÑŽÑ‡ÐµÐ¹"
-
-#: src/clipboard.c:796 src/fileman.c:537
-msgid "/Windows/_Filemanager"
-msgstr "/ÐžÐºÐ½Ð¾/ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ _Ñ„Ð°Ð¹Ð»Ð¾Ð²"
-
-#: src/clipboard.c:797 src/fileman.c:538 src/keyring.c:909
-msgid "/Windows/_Clipboard"
-msgstr "/ÐžÐºÐ½Ð¾/_Ð‘ÑƒÑ„ÐµÑ€"
-
-#: src/clipboard.c:824 src/keyring.c:948
-msgid "/Edit/Copy"
-msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
-
-#: src/clipboard.c:832
-msgid "/Edit/Delete"
-msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
-
-#: src/clipboard.c:840
-msgid "/Edit/Paste"
-msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_Ð’ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ"
-
-#: src/clipboard.c:945
-msgid "Clear buffer"
+#: src/clipboard.c:774
+#, fuzzy
+msgid "Close the buffer"
 msgstr "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ Ð±ÑƒÑ„ÐµÑ€"
 
-#: src/clipboard.c:945
-msgid "clear buffer"
-msgstr "Ð¾Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ Ð±ÑƒÑ„ÐµÑ€"
+#: src/clipboard.c:776 src/fileman.c:534 src/keyring.c:893
+msgid "Quit the program"
+msgstr ""
 
-#: src/clipboard.c:953 src/fileman.c:643
-msgid "Open a file"
-msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»"
+#: src/clipboard.c:782
+#, fuzzy
+msgid "Undo the last action"
+msgstr "ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ðµ Ð² Ð±ÑƒÑ„ÐµÑ€"
 
-#: src/clipboard.c:953 src/fileman.c:643
-msgid "open file"
-msgstr "Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»"
+#: src/clipboard.c:784
+msgid "Redo the last undone action"
+msgstr ""
 
-#: src/clipboard.c:958
-msgid "Save to a file"
-msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð² Ñ„Ð°Ð¹Ð»Ðµ"
-
-#: src/clipboard.c:958
-msgid "save file as"
-msgstr "ÑÐ¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» ÐºÐ°Ðº"
-
-#: src/clipboard.c:966
+#: src/clipboard.c:787
 msgid "Cut the selection"
 msgstr "Ð’Ñ‹Ñ€ÐµÐ·Ð°Ñ‚ÑŒ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ðµ Ð² Ð±ÑƒÑ„ÐµÑ€"
 
-#: src/clipboard.c:967
-msgid "cut the selection"
-msgstr "Ð²Ñ‹Ñ€ÐµÐ·Ð°Ñ‚ÑŒ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ðµ Ð² Ð±ÑƒÑ„ÐµÑ€"
-
-#: src/clipboard.c:973
+#: src/clipboard.c:789 src/keyring.c:897
 msgid "Copy the selection"
 msgstr "ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ðµ Ð² Ð±ÑƒÑ„ÐµÑ€"
 
-#: src/clipboard.c:974
-msgid "copy the selection"
-msgstr "ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ðµ Ð² Ð±ÑƒÑ„ÐµÑ€"
-
-#: src/clipboard.c:980
+#: src/clipboard.c:791 src/keyring.c:899
 msgid "Paste the clipboard"
 msgstr "Ð’ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¸Ð· Ð±ÑƒÑ„ÐµÑ€Ð°"
 
-#: src/clipboard.c:981
-msgid "paste the clipboard"
-msgstr "Ð²ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¸Ð· Ð±ÑƒÑ„ÐµÑ€Ð°"
-
-#: src/clipboard.c:991 src/fileman.c:653 src/keyring.c:1570
-msgid "Sign"
-msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ"
-
-#: src/clipboard.c:992
-msgid "Sign the selected text"
-msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ Ñ‚ÐµÐºÑÑ‚"
-
-#: src/clipboard.c:993
-msgid "sign text"
-msgstr "Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ñ‚ÐµÐºÑÑ‚"
-
-#: src/clipboard.c:1001 src/fileman.c:664
-msgid "Verify"
-msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ"
-
-#: src/clipboard.c:1002
-msgid "Check signatures of selected text"
-msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñ‚ÐµÐºÑÑ‚Ð°"
-
-#: src/clipboard.c:1003
-msgid "verify text"
-msgstr "Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ñ‚ÐµÐºÑÑ‚"
-
-#: src/clipboard.c:1011 src/fileman.c:675
-msgid "Encrypt"
-msgstr "Ð—Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
-
-#: src/clipboard.c:1012
-msgid "Encrypt the selected text"
-msgstr "Ð—Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ Ñ‚ÐµÐºÑÑ‚"
-
-#: src/clipboard.c:1013
-msgid "encrypt text"
-msgstr "Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ‚ÐµÐºÑÑ‚"
-
-#: src/clipboard.c:1021 src/fileman.c:686
-msgid "Decrypt"
-msgstr "Ð Ð°ÑÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
-
-#: src/clipboard.c:1022
-msgid "Decrypt the selected text"
+#: src/clipboard.c:793
+#, fuzzy
+msgid "Delete the selected text"
 msgstr "Ð Ð°ÑÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ Ñ‚ÐµÐºÑÑ‚"
 
-#: src/clipboard.c:1023
-msgid "decrypt text"
-msgstr "Ñ€Ð°ÑÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ‚ÐµÐºÑÑ‚"
+#: src/clipboard.c:795
+msgid "Select the entire document"
+msgstr ""
 
-#: src/clipboard.c:1033 src/fileman.c:699 src/keyring.c:1631
-msgid "Open the preferences dialog"
-msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¾ÐºÐ½Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐº"
-
-#: src/clipboard.c:1034 src/fileman.c:700 src/keyring.c:1632
-msgid "preferences"
-msgstr "Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
-
-#: src/clipboard.c:1041 src/fileman.c:707
+#: src/clipboard.c:902 src/fileman.c:625
 msgid "Keyring"
 msgstr "ÐšÐ»ÑŽÑ‡Ð¸"
 
-#: src/clipboard.c:1042 src/fileman.c:708
-msgid "Open the keyring editor"
-msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
-
-#: src/clipboard.c:1043 src/fileman.c:709
-msgid "keyring editor"
-msgstr "Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
-
-#: src/clipboard.c:1049 src/keyring.c:1648
+#: src/clipboard.c:904 src/keyring.c:1073
 msgid "Files"
 msgstr "Ð¤Ð°Ð¹Ð»Ñ‹"
 
-#: src/clipboard.c:1050 src/keyring.c:1649
-msgid "Open the file manager"
-msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€ Ñ„Ð°Ð¹Ð»Ð¾Ð²"
-
-#: src/clipboard.c:1051 src/keyring.c:1650
-msgid "file manager"
-msgstr "Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€ Ñ„Ð°Ð¹Ð»Ð¾Ð²"
-
-#: src/clipboard.c:1058 src/fileman.c:725 src/keyring.c:1665
-msgid "Help"
-msgstr "Ð¡Ð¿Ñ€Ð°Ð²ÐºÐ°"
-
-#: src/clipboard.c:1059 src/fileman.c:726 src/keyring.c:1666
-msgid "Understanding the GNU Privacy Assistant"
-msgstr "ÐšÐ°Ðº Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ GNU Privacy Assistant"
-
-#: src/clipboard.c:1060 src/fileman.c:727 src/keyring.c:1667
-msgid "help"
-msgstr "ÑÐ¿Ñ€Ð°Ð²ÐºÐ°"
-
-#: src/clipboard.c:1150
+#: src/clipboard.c:1004
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Privacy Assistant - Ð‘ÑƒÑ„ÐµÑ€"
 
-#: src/confdialog.c:993
+#: src/confdialog.c:994
 msgid "<b>Main</b>"
 msgstr "<b>Ð“Ð»Ð°Ð²Ð½Ð¾Ðµ</b>"
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default values"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default value"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
 
-#: src/confdialog.c:1146
+#: src/confdialog.c:1147
 msgid "Do not use option"
 msgstr "ÐÐµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð¾Ð¿Ñ†Ð¸ÑŽ"
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom values"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ²Ð¾Ð¸ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ"
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom value"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÐ²Ð¾Ðµ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ"
 
-#: src/confdialog.c:1155
+#: src/confdialog.c:1156
 msgid "Use default argument"
 msgstr "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð°Ñ€Ð³ÑƒÐ¼ÐµÐ½Ñ‚ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
 
-#: src/confdialog.c:1280
+#: src/confdialog.c:1281
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
@@ -351,58 +171,51 @@
 "Ð•ÑÑ‚ÑŒ Ð½ÐµÐ·Ð°Ñ„Ð¸ÐºÑÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ. Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ ÑÐºÑÐ¿ÐµÑ€Ñ‚Ð½Ð¾Ð¹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐ¸ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ‚ Ð¸Ñ… "
 "Ð·Ð°Ð¿Ð¾Ð¼Ð½Ð¸Ñ‚ÑŒ. ÐŸÑ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ?"
 
-#: src/confdialog.c:1325
+#: src/confdialog.c:1326
 msgid "Crypto Backend Configuration"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð»ÑŒÐ½Ð¾Ð¹ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹"
 
-#: src/confdialog.c:1334
+#: src/confdialog.c:1332
 msgid "Reset"
 msgstr "Ð¡Ð±Ñ€Ð¾ÑÐ¸Ñ‚ÑŒ"
 
-#: src/confdialog.c:1346
+#: src/confdialog.c:1351
 msgid "Configure the tools of the GnuPG system."
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¸Ð½ÑÑ‚Ñ€ÑƒÐ¼ÐµÐ½Ñ‚Ð¾Ð² GnuPG."
 
-#: src/confdialog.c:1350
+#: src/confdialog.c:1355
 msgid "Level:"
 msgstr "Ð£Ñ€Ð¾Ð²ÐµÐ½ÑŒ:"
 
-#: src/confdialog.c:1359
+#: src/confdialog.c:1364
 msgid "Basic"
 msgstr "ÐžÐ±Ñ‹Ñ‡Ð½Ñ‹Ð¹"
 
-#: src/confdialog.c:1360
+#: src/confdialog.c:1365
 msgid "Advanced"
 msgstr "Ð Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ‹Ð¹"
 
-#: src/confdialog.c:1361
+#: src/confdialog.c:1366
 msgid "Expert"
 msgstr "ÐÐºÑÐ¿ÐµÑ€Ñ‚Ð½Ñ‹Ð¹"
 
-#: src/encryptdlg.c:142 src/expirydlg.c:116 src/filesigndlg.c:133
-#: src/gpaprogressdlg.c:146 src/gparecvkeydlg.c:96 src/gpawizard.c:289
-#: src/gpgmetools.c:705 src/keygendlg.c:149 src/ownertrustdlg.c:111
-#: src/passwddlg.c:100
-msgid "_Cancel"
-msgstr "ÐžÑ‚_Ð¼ÐµÐ½Ð°"
-
-#: src/encryptdlg.c:143
+#: src/encryptdlg.c:139
 msgid "Encrypt documents"
 msgstr "Ð—Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ñ‹"
 
-#: src/encryptdlg.c:174
+#: src/encryptdlg.c:156
 msgid "_Public Keys"
 msgstr "_ÐžÑ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ðµ ÐºÐ»ÑŽÑ‡Ð¸"
 
-#: src/encryptdlg.c:177
+#: src/encryptdlg.c:179 src/icons.c:198
 msgid "_Sign"
 msgstr "_ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ"
 
-#: src/encryptdlg.c:201 src/filesigndlg.c:185
+#: src/encryptdlg.c:185
 msgid "Sign _as "
 msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ _ÐºÐ°Ðº"
 
-#: src/encryptdlg.c:215 src/filesigndlg.c:187
+#: src/encryptdlg.c:215 src/filesigndlg.c:227
 msgid "A_rmor"
 msgstr "_Ð—Ð°Ñ‰Ð¸Ñ‚Ð¸Ñ‚ÑŒ"
 
@@ -410,116 +223,94 @@
 msgid "Please provide a correct date."
 msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½ÑƒÑŽ Ð´Ð°Ñ‚Ñƒ."
 
-#: src/expirydlg.c:111
+#: src/expirydlg.c:108
 msgid "Change expiry date"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑÑ€Ð¾Ðº Ð³Ð¾Ð´Ð½Ð¾ÑÑ‚Ð¸"
 
-#: src/expirydlg.c:129
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+msgid "_Cancel"
+msgstr "ÐžÑ‚_Ð¼ÐµÐ½Ð°"
+
+#: src/expirydlg.c:124
 msgid "_never expire"
 msgstr "_Ð½ÐµÐ¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡."
 
-#: src/expirydlg.c:134
+#: src/expirydlg.c:129
 msgid "_expire on:"
 msgstr "_Ð³Ð¾Ð´ÐµÐ½ Ð´Ð¾:"
 
-#: src/fileman.c:557
-msgid "/File/Sign"
-msgstr "/Ð¤Ð°Ð¹Ð»/ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ"
-
-#: src/fileman.c:562
-msgid "/File/Verify"
-msgstr "/Ð¤Ð°Ð¹Ð»/ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ"
-
-#: src/fileman.c:567
-msgid "/File/Encrypt"
-msgstr "/Ð¤Ð°Ð¹Ð»/Ð—Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
-
-#: src/fileman.c:572
-msgid "/File/Decrypt"
-msgstr "/Ð¤Ð°Ð¹Ð»/Ð Ð°ÑÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
-
-#: src/fileman.c:647
+#: src/fileman.c:522
 msgid "Close all files"
 msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ Ð²ÑÐµ Ñ„Ð°Ð¹Ð»Ñ‹"
 
-#: src/fileman.c:647
-msgid "close files"
-msgstr "Ð·Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ñ‹"
-
-#: src/fileman.c:654
+#: src/fileman.c:524
 msgid "Sign the selected file"
 msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ Ñ„Ð°Ð¹Ð»"
 
-#: src/fileman.c:655
-msgid "sign file"
-msgstr "Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»"
-
-#: src/fileman.c:665
+#: src/fileman.c:526
 msgid "Check signatures of selected file"
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ð°"
 
-#: src/fileman.c:666
-msgid "verify file"
-msgstr "Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»"
-
-#: src/fileman.c:676
+#: src/fileman.c:528
 msgid "Encrypt the selected file"
 msgstr "Ð—Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ Ñ„Ð°Ð¹Ð»"
 
-#: src/fileman.c:677
-msgid "encrypt file"
-msgstr "Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»"
-
-#: src/fileman.c:687
+#: src/fileman.c:530
 msgid "Decrypt the selected file"
 msgstr "Ð Ð°ÑÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ Ñ„Ð°Ð¹Ð»"
 
-#: src/fileman.c:688
-msgid "decrypt file"
-msgstr "Ñ€Ð°ÑÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»"
+#: src/fileman.c:532
+msgid "Close the window"
+msgstr ""
 
-#: src/fileman.c:717 src/keyring.c:1658
-msgid "Open the clipboard"
-msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð±ÑƒÑ„ÐµÑ€"
+#: src/fileman.c:538
+#, fuzzy
+msgid "Select all files"
+msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ Ð²ÑÐµ Ñ„Ð°Ð¹Ð»Ñ‹"
 
-#: src/fileman.c:718 src/keyring.c:1659
-msgid "clipboard"
-msgstr "Ð±ÑƒÑ„ÐµÑ€"
-
-#: src/fileman.c:826
+#: src/fileman.c:731
 msgid "File"
 msgstr "Ð¤Ð°Ð¹Ð»"
 
-#: src/fileman.c:891
+#: src/fileman.c:796
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ Ñ„Ð°Ð¹Ð»Ð¾Ð²"
 
-#: src/fileman.c:917
+#: src/fileman.c:819
 msgid "File Manager"
 msgstr "ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ _Ñ„Ð°Ð¹Ð»Ð¾Ð²"
 
-#: src/fileman.c:993
+#: src/fileman.c:895
 msgid "The file is already open."
 msgstr "Ð¤Ð°Ð¹Ð» ÑƒÐ¶Ðµ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚."
 
-#: src/filesigndlg.c:134
+#: src/filesigndlg.c:171
 msgid "Sign documents"
 msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÑŒ Ñ„Ð°Ð¹Ð»Ð¾Ð²"
 
-#: src/filesigndlg.c:144
-msgid "Signing Mode"
+#: src/filesigndlg.c:180
+#, fuzzy
+msgid "<b>Sign _as</b>"
+msgstr "<b>Ð“Ð»Ð°Ð²Ð½Ð¾Ðµ</b>"
+
+#: src/filesigndlg.c:201
+#, fuzzy
+msgid "<b>Signing Mode</b>"
 msgstr "Ð ÐµÐ¶Ð¸Ð¼ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸"
 
-#: src/filesigndlg.c:152
-msgid "si_gn and compress"
+#: src/filesigndlg.c:211
+#, fuzzy
+msgid "Si_gn and compress"
 msgstr "_Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ Ð¸ ÑÐ¶Ð°Ñ‚Ð¸Ðµ"
 
-#: src/filesigndlg.c:158
-msgid "_cleartext signature"
+#: src/filesigndlg.c:217
+#, fuzzy
+msgid "Clear_text signature"
 msgstr "_Ñ‚ÐµÐºÑÑ‚Ð¾Ð²Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ"
 
-#: src/filesigndlg.c:165
-msgid "_detached signature"
+#: src/filesigndlg.c:223
+#, fuzzy
+msgid "_Detached signature"
 msgstr "_Ð¾Ñ‚Ð´ÐµÐ»ÑÐµÐ¼Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ"
 
 #: src/gpabackupop.c:208
@@ -569,22 +360,28 @@
 msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð±ÑƒÑ„ÐµÑ€"
 
 #: src/gpa.c:100
-msgid "Start only the UI server (implies --cms)"
+#, fuzzy
+msgid "Open the settings dialog"
+msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¾ÐºÐ½Ð¾ Ð½Ð°ÑÑ‚Ñ€Ð¾ÐµÐº"
+
+#: src/gpa.c:102
+#, fuzzy
+msgid "Enable the UI server (implies --cms)"
 msgstr "Ð¡Ñ‚Ð°Ñ€Ñ‚Ð¾Ð²Ð°Ñ‚ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ÑÐµÑ€Ð²ÐµÑ€ UI"
 
-#: src/gpa.c:102
+#: src/gpa.c:104
 msgid "Read options from file"
 msgstr "ÐŸÐ¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¸Ð· Ñ„Ð°Ð¹Ð»Ð°"
 
-#: src/gpa.c:293
+#: src/gpa.c:286
 msgid "[FILE...]"
 msgstr "[Ð¤ÐÐ™Ð›...]"
 
-#: src/gpa.c:295
+#: src/gpa.c:288
 msgid "Graphical frontend to GnuPG"
 msgstr "Ð“Ñ€Ð°Ñ„Ð¸Ñ‡ÐµÑÐºÐ°Ñ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐºÐ° Ðº GnuPG"
 
-#: src/gpa.c:296
+#: src/gpa.c:289
 msgid "Please report bugs to <"
 msgstr "ÐžÐ± Ð¾ÑˆÐ¸Ð±ÐºÐ°Ñ… ÑÐ¾Ð¾Ð±Ñ‰Ð°Ð¹Ñ‚Ðµ <"
 
@@ -616,15 +413,15 @@
 "(\"%s\").\n"
 "Ð”ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ñ€Ð°ÑÐ¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ð´Ð°Ð½Ð½Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡?"
 
-#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:455
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:459
 #: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
-#: src/keydeletedlg.c:93 src/keysigndlg.c:62 src/settingsdlg.c:165
+#: src/keydeletedlg.c:93 src/keysigndlg.c:61
 msgid "_Yes"
 msgstr "Ð”Ð°"
 
-#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:456
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:460
 #: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
-#: src/keydeletedlg.c:95 src/keysigndlg.c:64 src/settingsdlg.c:168
+#: src/keydeletedlg.c:95 src/keysigndlg.c:63
 msgid "_No"
 msgstr "ÐÐµÑ‚"
 
@@ -636,29 +433,29 @@
 msgid "Decrypting..."
 msgstr "Ð Ð°ÑÑˆÐ¸Ñ„Ñ€Ð¾Ð²ÐºÐ°..."
 
-#: src/gpafiledecryptop.c:358 src/gpafileverifyop.c:449
+#: src/gpafiledecryptop.c:367 src/gpafileverifyop.c:464
 #, c-format
 msgid "\"%s\" contained no OpenPGP data."
 msgstr "\"%s\" Ð½Ðµ ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ð´Ð°Ð½Ð½Ñ‹Ñ… OpenPGP."
 
-#: src/gpafiledecryptop.c:359 src/gpafileverifyop.c:450
+#: src/gpafiledecryptop.c:368 src/gpafileverifyop.c:465
 #, c-format
 msgid "The file \"%s\" contained no OpenPGPdata."
 msgstr "Ð¤Ð°Ð¹Ð» \"%s\" Ð½Ðµ ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ð´Ð°Ð½Ð½Ñ‹Ñ… OpenPGP."
 
-#: src/gpafiledecryptop.c:369
+#: src/gpafiledecryptop.c:378
 #, c-format
 msgid "\"%s\" contained no valid encrypted data."
 msgstr "\"%s\" Ð½Ðµ ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ… Ð´Ð°Ð½Ð½Ñ‹Ñ…."
 
-#: src/gpafiledecryptop.c:371
+#: src/gpafiledecryptop.c:380
 #, c-format
 msgid "The file \"%s\" contained no validencrypted data."
 msgstr "Ð¤Ð°Ð¹Ð» \"%s\" Ð½Ðµ ÑÐ¾Ð´ÐµÑ€Ð¶Ð¸Ñ‚ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð½Ñ‹Ñ… Ð´Ð°Ð½Ð½Ñ‹Ñ…."
 
-#: src/gpafiledecryptop.c:380 src/gpafileencryptop.c:757
-#: src/gpafilesignop.c:511 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
-#: src/gpakeypasswdop.c:197 src/gpakeysignop.c:229
+#: src/gpafiledecryptop.c:389 src/gpafileencryptop.c:751
+#: src/gpafilesignop.c:525 src/gpafileverifyop.c:475 src/gpakeyexpireop.c:240
+#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:237
 msgid "Wrong passphrase!"
 msgstr "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ!"
 
@@ -666,57 +463,56 @@
 msgid "Encrypting..."
 msgstr "Ð¨Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ..."
 
-#: src/gpafileencryptop.c:453 src/verifydlg.c:222
+#: src/gpafileencryptop.c:457 src/verifydlg.c:222
 msgid "Unknown Key"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡"
 
-#: src/gpafileencryptop.c:469
+#: src/gpafileencryptop.c:473
 msgid "You are going to encrypt a document using the following key:"
 msgstr "Ð¤Ð°Ð¹Ð» Ð±ÑƒÐ´ÐµÑ‚ Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½ ÐºÐ»ÑŽÑ‡Ð¾Ð¼:"
 
-#: src/gpafileencryptop.c:475
+#: src/gpafileencryptop.c:479
 msgid "However, it is not certain that the key belongs to that person."
 msgstr "ÐžÐ´Ð½Ð°ÐºÐ¾ Ð½ÐµÑ‚ ÑƒÐ²ÐµÑ€ÐµÐ½Ð½Ð¾ÑÑ‚Ð¸, Ñ‡Ñ‚Ð¾ ÐºÐ»ÑŽÑ‡ Ð¿Ñ€Ð¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð¸Ñ‚ Ð¸Ð¼ÐµÐ½Ð½Ð¾ ÑÑ‚Ð¾Ð¼Ñƒ Ñ‡ÐµÐ»Ð¾Ð²ÐµÐºÑƒ."
 
-#: src/gpafileencryptop.c:481
+#: src/gpafileencryptop.c:485
 msgid "Do you <b>really</b> want to use this key?"
 msgstr "Ð’Ñ‹ <b><Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ ÑƒÐ²ÐµÑ€ÐµÐ½Ñ‹/b>, Ñ‡Ñ‚Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð¾Ñ‚ ÐºÐ»ÑŽÑ‡? "
 
-#: src/gpafileencryptop.c:502 src/gpafileencryptop.c:542 src/verifydlg.c:227
+#: src/gpafileencryptop.c:506 src/gpafileencryptop.c:546 src/verifydlg.c:227
 msgid "Revoked Key"
 msgstr "ÐžÑ‚Ð·Ñ‹Ð² ÐºÐ»ÑŽÑ‡Ð°"
 
-#: src/gpafileencryptop.c:504 src/gpafileencryptop.c:544 src/gpawizard.c:281
-#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:436
-#: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
+#: src/gpafileencryptop.c:508 src/gpafileencryptop.c:548 src/gtktools.c:52
+#: src/gtktools.c:86 src/keyeditdlg.c:149 src/verifydlg.c:115
 msgid "_Close"
 msgstr "_Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ"
 
-#: src/gpafileencryptop.c:517
+#: src/gpafileencryptop.c:521
 msgid "The following key has been revoked by it's owner:"
 msgstr "ÐšÐ»ÑŽÑ‡ Ð¾Ñ‚Ð¾Ð·Ð²Ð°Ð½ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†ÐµÐ¼:"
 
-#: src/gpafileencryptop.c:522 src/gpafileencryptop.c:565
+#: src/gpafileencryptop.c:526 src/gpafileencryptop.c:569
 msgid "And can not be used for encryption."
 msgstr "ÐžÐ½ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒÑÑ Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
 
-#: src/gpafileencryptop.c:557
+#: src/gpafileencryptop.c:561
 #, c-format
 msgid "The following key expired on %s:"
 msgstr "Ð¡Ñ€Ð¾Ðº Ð³Ð¾Ð´Ð½Ð¾ÑÑ‚Ð¸ ÐºÐ»ÑŽÑ‡Ð° Ð¸ÑÑ‚ÐµÐº %s:"
 
-#: src/gpafileencryptop.c:596 src/gpafilesignop.c:429
+#: src/gpafileencryptop.c:600 src/gpafilesignop.c:448
 msgid ""
 "The selected certificates are not all of the same type. That is, you mixed "
 "OpenPGP and X.509 certificates. Please make sure to select only certificates "
 "of the same type."
 msgstr ""
 
-#: src/gpafileencryptop.c:671 src/gpafilesignop.c:415
+#: src/gpafileencryptop.c:675 src/gpafilesignop.c:434
 msgid "You didn't select any key for signing"
 msgstr "ÐÐµ Ð²Ñ‹Ð±Ñ€Ð°Ð½ ÐºÐ»ÑŽÑ‡ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸"
 
-#: src/gpafilesignop.c:148
+#: src/gpafilesignop.c:157
 msgid "Signing..."
 msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÑŒ..."
 
@@ -745,11 +541,11 @@
 msgid "Import public keys from file"
 msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ ÐºÐ»ÑŽÑ‡Ð° Ð¸Ð· Ñ„Ð°Ð¹Ð»Ð°"
 
-#: src/gpaimportop.c:197
+#: src/gpaimportop.c:196
 msgid "No keys were found."
 msgstr "ÐšÐ»ÑŽÑ‡Ð¸ Ð½Ðµ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ñ‹."
 
-#: src/gpaimportop.c:205
+#: src/gpaimportop.c:204
 #, c-format
 msgid ""
 "%i public keys read\n"
@@ -766,7 +562,7 @@
 "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ñ… ÐºÐ»ÑŽÑ‡ÐµÐ¹: %i\n"
 "ÐÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¾ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ñ… ÐºÐ»ÑŽÑ‡ÐµÐ¹: %i"
 
-#: src/gpakeyexpireop.c:239
+#: src/gpakeyexpireop.c:244
 msgid ""
 "Invalid time given.\n"
 "(you may not set the expiration time to the past.)"
@@ -774,29 +570,29 @@
 "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ð´Ð°Ñ‚Ð°.\n"
 "(ÐÐµÐ»ÑŒÐ·Ñ ÑƒÑÑ‚Ð°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°Ñ‚ÑŒ ÑÑ€Ð¾Ðº Ð³Ð¾Ð´Ð½Ð¾ÑÑ‚Ð¸ Ð·Ð°Ð´Ð½Ð¸Ð¼ Ñ‡Ð¸ÑÐ»Ð¾Ð¼.)"
 
-#: src/gpakeyselector.c:86 src/keylist.c:567 src/siglist.c:94
+#: src/gpakeyselector.c:86 src/keylist.c:555 src/siglist.c:94
 #: src/siglist.c:114 src/verifydlg.c:324
 msgid "Key ID"
 msgstr "ID ÐºÐ»ÑŽÑ‡Ð°"
 
-#: src/gpakeyselector.c:95 src/keylist.c:618 src/siglist.c:100
+#: src/gpakeyselector.c:95 src/keylist.c:606 src/siglist.c:100
 #: src/siglist.c:143 src/verifydlg.c:336
 msgid "User Name"
 msgstr "Ð˜Ð¼Ñ"
 
-#: src/gpakeysignop.c:188
+#: src/gpakeysignop.c:191
 msgid "No private key for signing."
 msgstr "ÐÐµÑ‚ ÑÐµÐºÑ€ÐµÑ‚Ð½Ð¾Ð³Ð¾ ÐºÐ»ÑŽÑ‡Ð° Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸."
 
-#: src/gpakeysignop.c:233
+#: src/gpakeysignop.c:241
 msgid "This key has expired! Unable to sign."
 msgstr "ÐÑ‚Ð¾Ñ‚ ÐºÐ»ÑŽÑ‡ ÑƒÑÑ‚Ð°Ñ€ÐµÐ»! ÐŸÐ¾Ð´Ð¿Ð¸ÑÑŒ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð°."
 
-#: src/gpakeysignop.c:237
+#: src/gpakeysignop.c:245
 msgid "This key has already been signed with your own!"
 msgstr "ÐÑ‚Ð¾Ñ‚ ÐºÐ»ÑŽÑ‡ ÑƒÐ¶Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½ Ð²Ð°ÑˆÐ¸Ð¼ ÐºÐ»ÑŽÑ‡Ð¾Ð¼!"
 
-#: src/gpakeysignop.c:242
+#: src/gpakeysignop.c:250
 msgid "You haven't selected a default key to sign with!"
 msgstr "ÐÐµ Ð²Ñ‹Ð±Ñ€Ð°Ð½ ÐºÐ»ÑŽÑ‡ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸!"
 
@@ -824,7 +620,7 @@
 msgid "unknown"
 msgstr "Ð½ÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð¾"
 
-#: src/gparecvkeydlg.c:101
+#: src/gparecvkeydlg.c:106
 msgid "Which key do you want to import? (The key must be specified by key ID)."
 msgstr "ÐšÐ°ÐºÐ¾Ð¹ ÐºÐ»ÑŽÑ‡ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ (ID ÐºÐ»ÑŽÑ‡Ð°)?"
 
@@ -848,7 +644,7 @@
 msgid "Size"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€"
 
-#: src/gpasubkeylist.c:97 src/keyeditdlg.c:171 src/keylist.c:580
+#: src/gpasubkeylist.c:97 src/keyeditdlg.c:168 src/keylist.c:568
 msgid "Expiry Date"
 msgstr "Ð¡Ñ€Ð¾Ðº Ð³Ð¾Ð´Ð½Ð¾ÑÑ‚Ð¸"
 
@@ -868,12 +664,12 @@
 msgid "Can authenticate"
 msgstr "ÐœÐ¾Ð¶ÐµÑ‚ Ð°Ð²Ñ‚Ð¾Ñ€Ð¸Ð·."
 
-#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:830
-#: src/gpgmetools.c:949
+#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:833
+#: src/gpgmetools.c:952
 msgid "Revoked"
 msgstr "ÐžÑ‚Ð¾Ð·Ð²Ð°Ð½"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:945
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:948
 msgid "Expired"
 msgstr "Ð˜ÑÑ‚ÐµÐº"
 
@@ -885,21 +681,21 @@
 msgid "Unsigned"
 msgstr "ÐÐµÐ¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:936 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:939 src/verifydlg.c:212
 msgid "Valid"
 msgstr "Ð”Ð¾ÑÑ‚Ð¾Ð²ÐµÑ€Ð½Ð¾"
 
 #: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
-#: src/keyring.c:1176 src/keysigndlg.c:104
+#: src/keyring.c:1248 src/keysigndlg.c:100
 msgid "User Name:"
 msgstr "Ð˜Ð¼Ñ:"
 
-#: src/gpawidgets.c:72 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/keysigndlg.c:100
 msgid "User Names:"
 msgstr "Ð˜Ð¼ÐµÐ½Ð°:"
 
 #: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
-#: src/keyring.c:1178
+#: src/keyring.c:1250
 msgid "Key ID:"
 msgstr "ID ÐºÐ»ÑŽÑ‡Ð°:"
 
@@ -911,15 +707,15 @@
 msgid "_indefinitely valid"
 msgstr "_Ð½Ðµ Ð²Ð¿Ð¾Ð»Ð½Ðµ Ð´Ð¾ÑÑ‚Ð¾Ð²ÐµÑ€ÐµÐ½"
 
-#: src/gpawidgets.c:196
+#: src/gpawidgets.c:195
 msgid "expire _after"
 msgstr "Ð½ÐµÐ´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÐµÐ½ Ð¿Ð¾ÑÐ»Ðµ"
 
-#: src/gpawidgets.c:216
+#: src/gpawidgets.c:215
 msgid "expire o_n:"
 msgstr "Ð½ÐµÐ´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÐµÐ½ Ñ:"
 
-#: src/gpawidgets.c:292 src/keygendlg.c:295
+#: src/gpawidgets.c:289 src/keygendlg.c:291
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -927,19 +723,7 @@
 "!ÐšÐ Ð˜Ð¢Ð˜Ð§Ð•Ð¡ÐšÐÐ¯ ÐžÐ¨Ð˜Ð‘ÐšÐ!\n"
 "ÐÐµÐ²ÐµÑ€Ð½Ñ‹Ð¹ Ñ€ÐµÐ¶Ð¸Ð¼ Ð´Ð»Ñ Ð´Ð°Ñ‚Ñ‹ ÑÑ€Ð¾ÐºÐ° Ð³Ð¾Ð´Ð½Ð¾ÑÑ‚Ð¸."
 
-#: src/gpawizard.c:260
-msgid "_Back"
-msgstr "_ÐÐ°Ð·Ð°Ð´"
-
-#: src/gpawizard.c:267
-msgid "_Forward"
-msgstr "_Ð”Ð°Ð»ÐµÐµ"
-
-#: src/gpawizard.c:274
-msgid "_Apply"
-msgstr "_ÐŸÑ€Ð¸Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
-
-#: src/gpgmetools.c:58
+#: src/gpgmetools.c:59
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -956,7 +740,7 @@
 "\n"
 "Ð Ð°Ð±Ð¾Ñ‚Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ñ€ÐµÑ€Ð²Ð°Ð½Ð°"
 
-#: src/gpgmetools.c:72
+#: src/gpgmetools.c:73
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -1019,7 +803,7 @@
 msgstr "RSA (Ñ‚Ð¾Ð»ÑŒÐºÐ¾ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ)"
 
 #: src/gpgmetools.c:590 src/gpgmetools.c:613 src/gpgmetools.c:630
-#: src/gpgmetools.c:941 src/gpgmetools.c:974
+#: src/gpgmetools.c:944 src/gpgmetools.c:977
 msgid "Unknown"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð¾"
 
@@ -1059,55 +843,55 @@
 msgid "Enter Passphrase"
 msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: src/gpgmetools.c:823
+#: src/gpgmetools.c:826
 msgid "[None]"
 msgstr "[ÐÐµÑ‚]"
 
-#: src/gpgmetools.c:913 src/verifydlg.c:269
+#: src/gpgmetools.c:916 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ñ‹Ð¹ ID Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ]"
 
-#: src/gpgmetools.c:939 src/verifydlg.c:217
+#: src/gpgmetools.c:942 src/verifydlg.c:217
 msgid "Bad"
 msgstr "ÐŸÐ»Ð¾Ñ…Ð¾Ð¹"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:965
 msgid "Generic"
 msgstr "ÐžÐ±Ñ‰Ð¸Ð¹"
 
-#: src/gpgmetools.c:965
+#: src/gpgmetools.c:968
 msgid "Persona"
 msgstr "ÐŸÐµÑ€ÑÐ¾Ð½."
 
-#: src/gpgmetools.c:968
+#: src/gpgmetools.c:971
 msgid "Casual"
 msgstr "Ð¡Ð»ÑƒÑ‡Ð°Ð¹Ð½."
 
-#: src/gpgmetools.c:971
+#: src/gpgmetools.c:974
 msgid "Positive"
 msgstr "ÐŸÐ¾Ð·Ð¸Ñ‚Ð¸Ð²."
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:992
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 "ÐšÐ»ÑŽÑ‡ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½ Ð´Ð»Ñ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸Ñ†Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ, Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸ Ð¸ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:995
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "ÐšÐ»ÑŽÑ‡ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½ Ð´Ð»Ñ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸Ñ†Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸, Ð½Ð¾ Ð½Ðµ Ð´Ð»Ñ "
 "ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
 
-#: src/gpgmetools.c:998
+#: src/gpgmetools.c:1001
 msgid "The key can be used for certification and encryption."
 msgstr "ÐšÐ»ÑŽÑ‡ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½ Ð´Ð»Ñ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸Ñ†Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
 
-#: src/gpgmetools.c:1001
+#: src/gpgmetools.c:1004
 msgid "The key can be used only for certification."
 msgstr "ÐšÐ»ÑŽÑ‡ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸Ñ†Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
 
-#: src/gpgmetools.c:1009
+#: src/gpgmetools.c:1012
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -1115,78 +899,71 @@
 "ÐšÐ»ÑŽÑ‡ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸ Ð¸ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ, Ð½Ð¾ Ð½Ðµ Ð´Ð»Ñ "
 "ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸Ñ†Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
 
-#: src/gpgmetools.c:1012
+#: src/gpgmetools.c:1015
 msgid "The key can be used only for signing."
 msgstr "ÐšÐ»ÑŽÑ‡ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸."
 
-#: src/gpgmetools.c:1017
+#: src/gpgmetools.c:1020
 msgid "The key can be used only for encryption."
 msgstr "ÐšÐ»ÑŽÑ‡ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ."
 
-#: src/gpgmetools.c:1020
+#: src/gpgmetools.c:1023
 msgid "This key is useless."
 msgstr "Ð”Ð°Ð½Ð½Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡ Ð±ÐµÑÐ¿Ð¾Ð»ÐµÐ·ÐµÐ½/Ð½ÐµÐ¿Ñ€Ð¸Ð¼ÐµÐ½Ð¸Ð¼."
 
-#: src/gtktools.c:320
+#: src/gtktools.c:48
 msgid "GPA Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° GPA"
 
-#: src/helpmenu.c:216
+#: src/helpmenu.c:83
 msgid "About GPA"
 msgstr "Ðž Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ðµ GPA"
 
-#: src/helpmenu.c:261
-msgid "Brought to you by:"
-msgstr "ÐŸÑ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½:"
+#: src/helpmenu.c:89
+#, fuzzy
+msgid "GPA is the GNU Privacy Assistant."
+msgstr "ÐšÐ°Ðº Ñ€Ð°Ð±Ð¾Ñ‚Ð°ÐµÑ‚ GNU Privacy Assistant"
 
-#: src/helpmenu.c:298
-msgid "GPA is Free Software under the"
-msgstr "GPA - Ð±ÐµÑÐ¿Ð»Ð°Ñ‚Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ð¿Ð¾ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¸"
+#: src/icons.c:199
+#, fuzzy
+msgid "_Verify"
+msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ"
 
-#: src/helpmenu.c:302
-msgid "GNU General Public License."
-msgstr "GNU General Public License."
+#: src/icons.c:200
+#, fuzzy
+msgid "_Encrypt"
+msgstr "Ð—Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
-#: src/helpmenu.c:306
-msgid "For news see:"
-msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ:"
+#: src/icons.c:201
+#, fuzzy
+msgid "_Decrypt"
+msgstr "Ð Ð°ÑÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
-#: src/helpmenu.c:311
-msgid "http://www.gpg4win.org"
-msgstr "http://www.gpg4win.org"
+#: src/icons.c:202
+#, fuzzy
+msgid "_Brief"
+msgstr "ÐšÑ€Ð°Ñ‚ÐºÐ¾"
 
-#: src/helpmenu.c:313
-msgid "http://www.gnupg.org"
-msgstr "http://www.gnupg.org"
+#: src/icons.c:203
+#, fuzzy
+msgid "_Detailed"
+msgstr "ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½Ð¾"
 
-#: src/helpmenu.c:396
-msgid "GNU General Public License"
-msgstr "GNU General Public License"
+#: src/icons.c:204
+#, fuzzy
+msgid "_Keyring Editor"
+msgstr "ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
 
-#: src/helpmenu.c:423
-msgid "_GNU General Public License"
-msgstr "_GNU General Public License"
+#: src/icons.c:205
+#, fuzzy
+msgid "_Clipboard"
+msgstr "Ð‘ÑƒÑ„ÐµÑ€"
 
-#: src/helpmenu.c:450
-msgid "Show Help Text\n"
-msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¿Ð¾Ð´ÑÐºÐ°Ð·ÐºÐ¸\n"
+#: src/icons.c:206
+#, fuzzy
+msgid "_File Manager"
+msgstr "ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ _Ñ„Ð°Ð¹Ð»Ð¾Ð²"
 
-#: src/helpmenu.c:458
-msgid "/_Help"
-msgstr "/Ð¡Ð¿_Ñ€Ð°Ð²ÐºÐ°"
-
-#: src/helpmenu.c:460
-msgid "/Help/_Contents"
-msgstr "/Ð¡Ð¿Ñ€Ð°Ð²ÐºÐ°/_Ð¡Ð¾Ð´ÐµÑ€Ð¶Ð°Ð½Ð¸Ðµ"
-
-#: src/helpmenu.c:463
-msgid "/Help/_License"
-msgstr "/Ð¡Ð¿Ñ€Ð°Ð²ÐºÐ°/_Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ"
-
-#: src/helpmenu.c:464
-msgid "/Help/_About"
-msgstr "/Ð¡Ð¿Ñ€Ð°Ð²ÐºÐ°/_Ðž Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ðµ"
-
 #: src/keydeletedlg.c:41
 msgid "Removing Secret Key"
 msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ ÐºÐ»ÑŽÑ‡Ð°"
@@ -1232,23 +1009,28 @@
 msgid "Are you sure you want to delete this key?"
 msgstr "Ð’Ñ‹ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ÑÑ‚Ð¾Ñ‚ ÐºÐ»ÑŽÑ‡?"
 
-#: src/keyeditdlg.c:149
+#: src/keyeditdlg.c:147
 msgid "Edit Key"
 msgstr "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡"
 
-#: src/keyeditdlg.c:165
+#: src/keyeditdlg.c:162
 msgid "Change _passphrase"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: src/keyeditdlg.c:185
+#: src/keyeditdlg.c:182
 msgid "Change _expiration"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ ÑÑ€Ð¾Ðº Ð³Ð¾Ð´Ð½Ð¾ÑÑ‚Ð¸"
 
-#: src/keygendlg.c:58
+#: src/keygendlg.c:67
+#, fuzzy
+msgid "You must enter a key size."
+msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ID Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ."
+
+#: src/keygendlg.c:72
 msgid "You must enter a User ID."
 msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ID Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ."
 
-#: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
+#: src/keygendlg.c:77 src/passwddlg.c:45
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -1256,7 +1038,7 @@
 "Ð’ Ð¿Ð¾Ð»ÑÑ… \"ÐŸÐ°Ñ€Ð¾Ð»ÑŒ\" Ð¸ \"ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ðµ\",\n"
 "Ð½ÑƒÐ¶Ð½Ð¾ Ð²Ð²ÐµÑÑ‚Ð¸ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ñ‹Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ð¸."
 
-#: src/keygendlg.c:70 src/keygenwizard.c:314 src/passwddlg.c:52
+#: src/keygendlg.c:84 src/passwddlg.c:52
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1264,7 +1046,7 @@
 "Ð’Ñ‹ Ð½Ðµ Ð²Ð²ÐµÐ»Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ.\n"
 "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ Ð´Ð»Ñ Ð·Ð°Ñ‰Ð¸Ñ‚Ñ‹ Ð²Ð°ÑˆÐµÐ³Ð¾ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ ÐºÐ»ÑŽÑ‡Ð°."
 
-#: src/keygendlg.c:83 src/keygenwizard.c:328 src/passwddlg.c:65
+#: src/keygendlg.c:97 src/passwddlg.c:65
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1276,23 +1058,25 @@
 "\n"
 "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð²Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð½Ð¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ."
 
-#: src/keygendlg.c:88 src/keygenwizard.c:333 src/passwddlg.c:70
+#: src/keygendlg.c:102 src/passwddlg.c:70
 msgid "_Enter new passphrase"
 msgstr "_ÐÐ¾Ð²Ñ‹Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ"
 
-#: src/keygendlg.c:89 src/keygenwizard.c:334 src/passwddlg.c:71
+#: src/keygendlg.c:104 src/passwddlg.c:71
 msgid "Take this one _anyway"
 msgstr "Ð‘ÑƒÐ´Ñƒ _Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ ÑÑ‚Ð¾Ñ‚"
 
-#: src/keygendlg.c:144 src/keygenwizard.c:541
+#: src/keygendlg.c:150 src/keygenwizard.c:571 src/keygenwizard.c:584
+#: src/keygenwizard.c:594 src/keygenwizard.c:604 src/keygenwizard.c:616
+#: src/keygenwizard.c:633 src/keygenwizard.c:645
 msgid "Generate key"
 msgstr "Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ ÐºÐ»ÑŽÑ‡Ð°"
 
-#: src/keygendlg.c:185
+#: src/keygendlg.c:177
 msgid "_Algorithm: "
 msgstr "ÐÐ»Ð³Ð¾Ñ€Ð¸Ñ‚Ð¼: "
 
-#: src/keygendlg.c:197
+#: src/keygendlg.c:192
 msgid "_Key size (bits): "
 msgstr "Ð”Ð»Ð¸Ð½Ð° ÐºÐ»ÑŽÑ‡Ð° (Ð±Ð¸Ñ‚): "
 
@@ -1308,27 +1092,27 @@
 msgid "2048"
 msgstr "2048"
 
-#: src/keygendlg.c:216
+#: src/keygendlg.c:206
 msgid "_User ID: "
 msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
 
-#: src/keygendlg.c:226
+#: src/keygendlg.c:217
 msgid "_Email: "
 msgstr "_Email: "
 
-#: src/keygendlg.c:236
+#: src/keygendlg.c:226
 msgid "_Comment: "
 msgstr "ÐšÐ¾Ð¼Ð¼ÐµÐ½Ñ‚Ð°Ñ€Ð¸Ð¹: "
 
-#: src/keygendlg.c:248
+#: src/keygendlg.c:235
 msgid "_Passphrase: "
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ: "
 
-#: src/keygendlg.c:260
+#: src/keygendlg.c:246
 msgid "_Repeat passphrase: "
 msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ÐµÑ‰Ðµ Ñ€Ð°Ð·: "
 
-#: src/keygenwizard.c:152
+#: src/keygenwizard.c:172
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1340,19 +1124,16 @@
 "Ð’Ð°ÑˆÐµ Ð¸Ð¼Ñ ÑÑ‚Ð°Ð½ÐµÑ‚ Ñ‡Ð°ÑÑ‚ÑŒ Ð²Ð½Ð¾Ð²ÑŒ ÑÐ¾Ð·Ð´Ð°Ð²Ð°ÐµÐ¼Ð¾Ð³Ð¾ ÐºÐ»ÑŽÑ‡Ð° Ð¸ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ‚ Ð´Ñ€ÑƒÐ³Ð¸Ð¼ Ð½Ð°Ð¹Ñ‚Ð¸ Ð’Ð°Ñˆ "
 "ÐºÐ»ÑŽÑ‡."
 
-#: src/keygenwizard.c:157
+#: src/keygenwizard.c:175
 msgid "Your Name:"
 msgstr "Ð’Ð°ÑˆÐµ Ð¸Ð¼Ñ (Ð°Ð½Ð³Ð».):"
 
-#: src/keygenwizard.c:170
-msgid "Please insert your name"
-msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÑÐ²Ð¾Ðµ Ð¸Ð¼Ñ (Ð°Ð½Ð³Ð».)"
-
-#: src/keygenwizard.c:183
+#: src/keygenwizard.c:211
+#, fuzzy
 msgid ""
 "Please insert your email address.\n"
 "\n"
-" Your email address will be part of the new key to make it easier for others "
+"Your email address will be part of the new key to make it easier for others "
 "to identify keys. If you have several email addresses, you can add further "
 "email adresses later."
 msgstr ""
@@ -1362,27 +1143,40 @@
 "Ð¾Ð¿Ð¾Ð·Ð½Ð°Ð²Ð°Ñ‚ÑŒ Ð²Ð°Ñˆ ÐºÐ»ÑŽÑ‡.\n"
 "Ð•ÑÐ»Ð¸ Ð²Ñ‹ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÑ‚Ðµ Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð°Ð´Ñ€ÐµÑÐ¾Ð² email, Ð²Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð¸Ñ… Ð¿Ð¾Ð·Ð¶Ðµ."
 
-#: src/keygenwizard.c:190
+#: src/keygenwizard.c:215
 msgid "Your Email Address:"
 msgstr "Ð’Ð°Ñˆ Ð°Ð´Ñ€ÐµÑ email:"
 
-#: src/keygenwizard.c:205
-msgid "Please insert your email address"
-msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÑÐ²Ð¾Ð¹ Ð°Ð´Ñ€ÐµÑ email"
-
-#: src/keygenwizard.c:239
+#: src/keygenwizard.c:319
 msgid "Please choose a passphrase for the new key."
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÐºÐ»ÑŽÑ‡Ð°."
 
-#: src/keygenwizard.c:248 src/passwddlg.c:108
+#: src/keygenwizard.c:326
+#, fuzzy
+msgid ""
+"In \"Passphrase\" and \"Repeat passphrase\", you must enter the same "
+"passphrase."
+msgstr ""
+"Ð’ Ð¿Ð¾Ð»ÑÑ… \"ÐŸÐ°Ñ€Ð¾Ð»ÑŒ\" Ð¸ \"ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ðµ\",\n"
+"Ð½ÑƒÐ¶Ð½Ð¾ Ð²Ð²ÐµÑÑ‚Ð¸ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²Ñ‹Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ð¸."
+
+#: src/keygenwizard.c:335
+msgid "Warning: The passphrase you have entered is not very secure."
+msgstr ""
+
+#: src/keygenwizard.c:350
+msgid "Quality: "
+msgstr ""
+
+#: src/keygenwizard.c:358 src/passwddlg.c:111
 msgid "Passphrase: "
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ: "
 
-#: src/keygenwizard.c:261 src/passwddlg.c:117
+#: src/keygenwizard.c:370 src/passwddlg.c:120
 msgid "Repeat Passphrase: "
 msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð¸Ñ‚Ðµ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ: "
 
-#: src/keygenwizard.c:358
+#: src/keygenwizard.c:412
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1393,15 +1187,15 @@
 "\n"
 "Ð¡Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½ÑƒÑŽ ÐºÐ¾Ð¿Ð¸ÑŽ?"
 
-#: src/keygenwizard.c:367
+#: src/keygenwizard.c:420
 msgid "Create _backup copy"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½ÑƒÑŽ ÐºÐ¾Ð¿Ð¸ÑŽ"
 
-#: src/keygenwizard.c:374 src/keyring.c:739 src/keyring.c:767
+#: src/keygenwizard.c:425 src/keyring.c:737 src/keyring.c:763
 msgid "Do it _later"
 msgstr "ÐŸÐ¾Ð·Ð¶Ðµ"
 
-#: src/keygenwizard.c:402
+#: src/keygenwizard.c:454
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1412,7 +1206,7 @@
 "Ð”Ð°Ð¶Ðµ Ð½Ð° Ð±Ñ‹ÑÑ‚Ñ€Ñ‹Ñ… ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ð°Ñ… ÑÑ‚Ð¾ Ð·Ð°Ð½Ð¸Ð¼Ð°ÐµÑ‚ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð²Ñ€ÐµÐ¼Ñ. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, "
 "Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸Ñ‚Ðµ."
 
-#: src/keygenwizard.c:411
+#: src/keygenwizard.c:463
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1432,25 +1226,25 @@
 "GnuPG Ð¿ÐµÑ€ÐµÑÑ‚Ñ€Ð°Ð¸Ð²Ð°ÐµÑ‚ Ð±Ð°Ð·Ñƒ Ñ Ð·Ð°Ð¿Ð¸ÑÑÐ¼Ð¸ Ð¾Ð± ÑƒÑ€Ð¾Ð²Ð½Ðµ Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ.\n"
 "ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´."
 
-#: src/keylist.c:559
+#: src/keylist.c:547
 msgid ""
 "This columns lists the type of the certificate.  A 'P' denotes OpenPGP and a "
 "'X' denotes X.509 (S/MIME)."
 msgstr ""
 
-#: src/keylist.c:568
+#: src/keylist.c:556
 msgid "The key ID is a short number to identify a certificate."
 msgstr "ID ÐºÐ»ÑŽÑ‡Ð° - ÐºÐ¾Ñ€Ð¾Ñ‚ÐºÐ¸Ð¹ Ð½Ð¾Ð¼ÐµÑ€ Ð´Ð»Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð°."
 
-#: src/keylist.c:581
+#: src/keylist.c:569
 msgid "The Expiry Date is the date until the certificate is valid."
 msgstr "Ð¡Ñ€Ð¾Ðº Ð³Ð¾Ð´Ð½Ð¾ÑÑ‚Ð¸ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÑÐµÑ‚ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ÑÑ‚ÑŒ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð°."
 
-#: src/keylist.c:591 src/ownertrustdlg.c:122
+#: src/keylist.c:579 src/ownertrustdlg.c:123
 msgid "Owner Trust"
 msgstr "Ð”Ð¾Ð²ÐµÑ€Ð¸Ðµ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ñƒ"
 
-#: src/keylist.c:592
+#: src/keylist.c:580
 msgid ""
 "The Owner Trust has been set by you and describes how far you trust the "
 "holder of the certificate to correctly sign (certify) other certificates.  "
@@ -1460,11 +1254,11 @@
 "Ð½Ð°ÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð´Ð¾Ð²ÐµÑ€ÑÐµÑ‚Ðµ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ñƒ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ð° Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‹Ð²Ð°Ñ‚ÑŒ Ð´Ñ€ÑƒÐ³Ð¸Ðµ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñ‹. "
 "(ÐÐºÑ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð´Ð»Ñ OpenPGP)."
 
-#: src/keylist.c:604
+#: src/keylist.c:592
 msgid "Validity"
 msgstr "Ð”Ð¾ÑÑ‚Ð¾Ð²ÐµÑ€Ð½Ð¾ÑÑ‚ÑŒ"
 
-#: src/keylist.c:605
+#: src/keylist.c:593
 msgid ""
 "The Validity describes the trust level the system has in this certificate.  "
 "That is how sure it is that the named user is actually that user."
@@ -1472,7 +1266,7 @@
 "Ð”Ð¾ÑÑ‚Ð¾Ð²ÐµÑ€Ð½Ð¾ÑÑ‚ÑŒ - ÑƒÑ€Ð¾Ð²ÐµÐ½ÑŒ Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ Ðº Ð´Ð°Ð½Ð½Ð¾Ð¼Ñƒ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚Ñƒ (Ð½Ð°ÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð¼Ð¾Ð¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ "
 "ÑƒÐ²ÐµÑ€ÐµÐ½Ð½Ñ‹Ð¼, Ñ‡Ñ‚Ð¾ ÑÐµÑ€Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ‚ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾ Ð¿Ñ€Ð¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð¸Ñ‚ Ð´Ð°Ð½Ð½Ð¾Ð¼Ñƒ Ð»Ð¸Ñ†Ñƒ)."
 
-#: src/keylist.c:619
+#: src/keylist.c:607
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
@@ -1482,7 +1276,7 @@
 msgid "No keys selected for signing."
 msgstr "ÐÐµ Ð²Ñ‹Ð±Ñ€Ð°Ð½ ÐºÐ»ÑŽÑ‡ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸."
 
-#: src/keyring.c:734
+#: src/keyring.c:732
 msgid ""
 "You do not have a private key yet. Do you want to generate one now "
 "(recommended) or do it later?"
@@ -1490,11 +1284,11 @@
 "Ð£ Ð²Ð°Ñ Ð¿Ð¾ÐºÐ° Ð½ÐµÑ‚ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ ÐºÐ»ÑŽÑ‡Ð°. Ð¥Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ ÐµÐ³Ð¾ ÑÐµÐ¹Ñ‡Ð°Ñ (Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ) "
 "Ð¸Ð»Ð¸ Ð¿Ð¾Ð·Ð¶Ðµ?"
 
-#: src/keyring.c:738
+#: src/keyring.c:736
 msgid "_Generate key now"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡"
 
-#: src/keyring.c:761
+#: src/keyring.c:757
 msgid ""
 "You do not have a backup copy of your private key yet. Do you want to backup "
 "your key now (recommended) or do it later?"
@@ -1502,216 +1296,209 @@
 "Ð’Ñ‹ ÐµÑ‰Ðµ Ð½Ðµ ÑÐ´ÐµÐ»Ð°Ð»Ð¸ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½ÑƒÑŽ ÐºÐ¾Ð¿Ð¸ÑŽ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ ÐºÐ»ÑŽÑ‡Ð°. Ð¥Ð¾Ñ‚Ð¸Ñ‚Ðµ ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ ÐµÐµ ÑÐµÐ¹Ñ‡Ð°Ñ "
 "(Ñ€ÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑƒÐµÑ‚ÑÑ) Ð¸Ð»Ð¸ Ð¿Ð¾Ð·Ð¶Ðµ?"
 
-#: src/keyring.c:766
+#: src/keyring.c:762
 msgid "_Backup key now"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½ÑƒÑŽ ÐºÐ¾Ð¿Ð¸ÑŽ"
 
-#: src/keyring.c:883
-msgid "/_Keys"
+#: src/keyring.c:886
+#, fuzzy
+msgid "_Keys"
 msgstr "/_ÐšÐ»ÑŽÑ‡Ð¸"
 
-#: src/keyring.c:884
-msgid "/Keys/_Refresh"
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
-
-#: src/keyring.c:886
-msgid "/Keys/sep0"
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/sep0"
-
 #: src/keyring.c:887
-msgid "/Keys/_New Key..."
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ..."
+#, fuzzy
+msgid "_Server"
+msgstr "/_Ð¡ÐµÑ€Ð²ÐµÑ€"
 
-#: src/keyring.c:889
-msgid "/Keys/_Delete Keys..."
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ..."
+#: src/keyring.c:901
+msgid "Select all certificates"
+msgstr ""
 
-#: src/keyring.c:891
-msgid "/Keys/sep1"
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/sep1"
+#: src/keyring.c:906
+msgid "Refresh the keyring"
+msgstr "ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ²ÑÐ·ÐºÑƒ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
 
-#: src/keyring.c:892
-msgid "/Keys/_Sign Keys..."
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ..."
+#: src/keyring.c:907
+#, fuzzy
+msgid "_New key..."
+msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ..."
 
-#: src/keyring.c:893
-msgid "/Keys/Set _Owner Trust..."
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_Ð”Ð¾Ð²ÐµÑ€Ð¸Ðµ..."
+#: src/keyring.c:908
+#, fuzzy
+msgid "Generate a new key"
+msgstr "Ð“ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ñ ÐºÐ»ÑŽÑ‡Ð°"
 
-#: src/keyring.c:894
-msgid "/Keys/_Edit Private Key..."
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ..."
+#: src/keyring.c:909
+#, fuzzy
+msgid "_Delete keys"
+msgstr "/Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
 
-#: src/keyring.c:895
-msgid "/Keys/sep2"
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/sep2"
+#: src/keyring.c:910
+msgid "Remove the selected key"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡"
 
-#: src/keyring.c:896
-msgid "/Keys/_Import Keys..."
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚..."
+#: src/keyring.c:911
+#, fuzzy
+msgid "_Sign Keys..."
+msgstr "/ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
 
-#: src/keyring.c:897
-msgid "/Keys/E_xport Keys..."
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_ÐÐºÑÐ¿Ð¾Ñ€Ñ‚..."
+#: src/keyring.c:912
+msgid "Sign the selected key"
+msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡"
 
-#: src/keyring.c:898
-msgid "/Keys/_Backup..."
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/Ð Ðµ_Ð·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ..."
+#: src/keyring.c:913
+#, fuzzy
+msgid "Set _Owner Trust..."
+msgstr "/Ð”Ð¾Ð²ÐµÑ€Ð¸Ðµ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ñƒ..."
 
-#: src/keyring.c:901
-msgid "/_Server"
-msgstr "/_Ð¡ÐµÑ€Ð²ÐµÑ€"
+#: src/keyring.c:914
+#, fuzzy
+msgid "Set owner trust of the selected key"
+msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡"
 
-#: src/keyring.c:902
-msgid "/Server/_Retrieve Keys..."
-msgstr "/Ð¡ÐµÑ€Ð²ÐµÑ€/_Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
+#: src/keyring.c:916
+#, fuzzy
+msgid "_Edit Private Key..."
+msgstr "/Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡..."
 
-#: src/keyring.c:903
-msgid "/Server/_Send Keys..."
-msgstr "/Ð¡ÐµÑ€Ð²ÐµÑ€/_ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
+#: src/keyring.c:917
+msgid "Edit the selected private key"
+msgstr "ÐŸÑ€Ð°Ð²ÐºÐ° Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ ÐºÐ»ÑŽÑ‡Ð°"
 
-#: src/keyring.c:908
-msgid "/Windows/_File Manager"
-msgstr "/_ÐžÐºÐ½Ð¾/ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ _Ñ„Ð°Ð¹Ð»Ð¾Ð²"
+#: src/keyring.c:919
+#, fuzzy
+msgid "_Import Keys..."
+msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
 
-#: src/keyring.c:939
-msgid "/Keys/Export Keys..."
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/ÐÐºÑÐ¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
+#: src/keyring.c:920
+msgid "Import Keys"
+msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
 
-#: src/keyring.c:944
-msgid "/Keys/Delete Keys..."
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
+#: src/keyring.c:921
+#, fuzzy
+msgid "E_xport Keys..."
+msgstr "/ÐÐºÑÐ¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
 
-#: src/keyring.c:952
-msgid "/Server/Send Keys..."
-msgstr "/Ð¡ÐµÑ€Ð²ÐµÑ€/ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
+#: src/keyring.c:922
+msgid "Export Keys"
+msgstr "ÐÐºÑÐ¿Ð¾Ñ€Ñ‚ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
 
-#: src/keyring.c:959
-msgid "/Keys/Set Owner Trust..."
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/Ð”Ð¾Ð²ÐµÑ€Ð¸Ðµ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ñƒ..."
+#: src/keyring.c:923
+#, fuzzy
+msgid "_Backup..."
+msgstr "/Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ..."
 
-#: src/keyring.c:966
-msgid "/Keys/Sign Keys..."
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡..."
+#: src/keyring.c:924
+#, fuzzy
+msgid "Backup key"
+msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½ÑƒÑŽ ÐºÐ¾Ð¿Ð¸ÑŽ"
 
-#: src/keyring.c:972
-msgid "/Keys/Edit Private Key..."
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡..."
+#: src/keyring.c:927
+#, fuzzy
+msgid "_Retrieve Keys..."
+msgstr "/Ð¡ÐµÑ€Ð²ÐµÑ€/_Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
 
-#: src/keyring.c:977
-msgid "/Keys/Backup..."
-msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ..."
+#: src/keyring.c:928
+msgid "Retrieve keys from server"
+msgstr ""
 
-#: src/keyring.c:994
-msgid "/_Copy"
-msgstr "/ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
-
-#: src/keyring.c:996
-msgid "/_Paste"
-msgstr "/Ð’ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ"
-
-#: src/keyring.c:998
-msgid "/_Delete Keys..."
-msgstr "/Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
-
-#: src/keyring.c:1001
-msgid "/_Sign Keys..."
+#: src/keyring.c:930
+#, fuzzy
+msgid "_Send Keys..."
 msgstr "/ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
 
-#: src/keyring.c:1002
-msgid "/Set _Owner Trust..."
-msgstr "/Ð”Ð¾Ð²ÐµÑ€Ð¸Ðµ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ñƒ..."
+#: src/keyring.c:931
+#, fuzzy
+msgid "Send keys to server"
+msgstr "/ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€..."
 
-#: src/keyring.c:1003
-msgid "/_Edit Private Key..."
-msgstr "/Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡..."
+#: src/keyring.c:937
+msgid "Show Brief Keylist"
+msgstr "ÐšÑ€Ð°Ñ‚ÐºÐ¸Ð¹ ÑÐ¿Ð¸ÑÐ¾Ðº ÐºÐ»ÑŽÑ‡ÐµÐ¹"
 
-#: src/keyring.c:1005
-msgid "/E_xport Keys..."
-msgstr "/ÐÐºÑÐ¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
+#: src/keyring.c:939
+msgid "Show Key Details"
+msgstr "ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½Ñ‹Ð¹ ÑÐ¿Ð¸ÑÐ¾Ðº ÐºÐ»ÑŽÑ‡ÐµÐ¹"
 
-#: src/keyring.c:1006
-msgid "/Se_nd Keys to Server..."
-msgstr "/ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ð½Ð° ÑÐµÑ€Ð²ÐµÑ€..."
+#: src/keyring.c:1063
+msgid "Edit"
+msgstr "ÐŸÑ€Ð°Ð²ÐºÐ°"
 
-#: src/keyring.c:1007
-msgid "/_Backup..."
-msgstr "/Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ..."
+#: src/keyring.c:1065
+#, fuzzy
+msgid "Delete"
+msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
-#: src/keyring.c:1018
-msgid "/Set Owner Trust..."
-msgstr "/Ð”Ð¾Ð²ÐµÑ€Ð¸Ðµ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ñƒ..."
+#: src/keyring.c:1067
+msgid "Sign"
+msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ"
 
-#: src/keyring.c:1025
-msgid "/Sign Keys..."
-msgstr "/ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
+#: src/keyring.c:1069
+msgid "Export"
+msgstr "ÐÐºÑÐ¿Ð¾Ñ€Ñ‚"
 
-#: src/keyring.c:1031
-msgid "/Edit Private Key..."
-msgstr "/Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡..."
+#: src/keyring.c:1071
+msgid "Import"
+msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚"
 
-#: src/keyring.c:1036
-msgid "/Backup..."
-msgstr "/Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ..."
-
-#: src/keyring.c:1106
+#: src/keyring.c:1178
 msgid "Subkeys"
 msgstr "ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ð¸"
 
-#: src/keyring.c:1180 src/keysigndlg.c:110
+#: src/keyring.c:1252 src/keysigndlg.c:106
 msgid "Fingerprint:"
 msgstr "ÐžÑ‚Ð¿ÐµÑ‡Ð°Ñ‚Ð¾Ðº:"
 
-#: src/keyring.c:1182
+#: src/keyring.c:1254
 msgid "Expires at:"
 msgstr "Ð“Ð¾Ð´ÐµÐ½ Ð´Ð¾:"
 
-#: src/keyring.c:1184
+#: src/keyring.c:1256
 msgid "Owner Trust:"
 msgstr "Ð”Ð¾Ð²ÐµÑ€Ð¸Ðµ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ñƒ:"
 
-#: src/keyring.c:1186
+#: src/keyring.c:1258
 msgid "Key Validity:"
 msgstr "Ð”Ð¾ÑÑ‚Ð¾Ð²ÐµÑ€Ð½Ð¾ÑÑ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð°:"
 
-#: src/keyring.c:1188
+#: src/keyring.c:1260
 msgid "Key Type:"
 msgstr "Ð¢Ð¸Ð¿ ÐºÐ»ÑŽÑ‡Ð°:"
 
-#: src/keyring.c:1190
+#: src/keyring.c:1262
 msgid "Created at:"
 msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½:"
 
-#: src/keyring.c:1193
+#: src/keyring.c:1265
 msgid "Details"
 msgstr "ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½Ð¾"
 
-#: src/keyring.c:1201
+#: src/keyring.c:1273
 msgid "Show signatures on user name:"
 msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸ Ð¸Ð¼ÐµÐ½Ð¸ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ð°:"
 
-#: src/keyring.c:1225
+#: src/keyring.c:1298
 msgid "Signatures"
 msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ¸"
 
-#: src/keyring.c:1249
+#: src/keyring.c:1322
 msgid "The key has both a private and a public part"
 msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¹ Ð¸ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡Ð¸"
 
-#: src/keyring.c:1252
+#: src/keyring.c:1325
 msgid "The key has only a public part"
 msgstr "Ð¢Ð¾Ð»ÑŒÐºÐ¾ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡"
 
-#: src/keyring.c:1287
+#: src/keyring.c:1360
 #, c-format
 msgid "%s %u bits"
 msgstr "%s %u Ð±Ð¸Ñ‚"
 
-#: src/keyring.c:1312
+#: src/keyring.c:1385
 msgid "No keys selected"
 msgstr "ÐÐµ Ð²Ñ‹Ð±Ñ€Ð°Ð½ ÐºÐ»ÑŽÑ‡"
 
-#: src/keyring.c:1315
+#: src/keyring.c:1388
 #, c-format
 msgid "%d key selected"
 msgid_plural "%d keys selected"
@@ -1719,119 +1506,35 @@
 msgstr[1] "%d ÐºÐ»ÑŽÑ‡Ð° Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð¾"
 msgstr[2] "%d ÐºÐ»ÑŽÑ‡ÐµÐ¹ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð¾"
 
-#: src/keyring.c:1347
+#: src/keyring.c:1423
 msgid "All signatures"
 msgstr "Ð’ÑÐµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸"
 
-#: src/keyring.c:1552
-msgid "Edit"
-msgstr "ÐŸÑ€Ð°Ð²ÐºÐ°"
-
-#: src/keyring.c:1553
-msgid "Edit the selected private key"
-msgstr "ÐŸÑ€Ð°Ð²ÐºÐ° Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ð³Ð¾ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¾Ð³Ð¾ ÐºÐ»ÑŽÑ‡Ð°"
-
-#: src/keyring.c:1554
-msgid "edit key"
-msgstr "Ð¿Ñ€Ð°Ð²ÐºÐ° ÐºÐ»ÑŽÑ‡Ð°"
-
-#: src/keyring.c:1562
-msgid "Remove the selected key"
-msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡"
-
-#: src/keyring.c:1563
-msgid "remove key"
-msgstr "ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡"
-
-#: src/keyring.c:1571
-msgid "Sign the selected key"
-msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡"
-
-#: src/keyring.c:1571
-msgid "sign key"
-msgstr "Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ ÐºÐ»ÑŽÑ‡Ð°"
-
 #: src/keyring.c:1578
-msgid "Import"
-msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚"
-
-#: src/keyring.c:1579
-msgid "Import Keys"
-msgstr "Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
-
-#: src/keyring.c:1579
-msgid "import keys"
-msgstr "Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
-
-#: src/keyring.c:1584
-msgid "Export"
-msgstr "ÐÐºÑÐ¿Ð¾Ñ€Ñ‚"
-
-#: src/keyring.c:1585
-msgid "Export Keys"
-msgstr "ÐÐºÑÐ¿Ð¾Ñ€Ñ‚ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
-
-#: src/keyring.c:1585
-msgid "export keys"
-msgstr "ÑÐºÑÐ¿Ð¾Ñ€Ñ‚ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
-
-#: src/keyring.c:1598
-msgid "Brief"
-msgstr "ÐšÑ€Ð°Ñ‚ÐºÐ¾"
-
-#: src/keyring.c:1598
-msgid "Show Brief Keylist"
-msgstr "ÐšÑ€Ð°Ñ‚ÐºÐ¸Ð¹ ÑÐ¿Ð¸ÑÐ¾Ðº ÐºÐ»ÑŽÑ‡ÐµÐ¹"
-
-#: src/keyring.c:1599
-msgid "brief"
-msgstr "ÐºÑ€Ð°Ñ‚ÐºÐ¾"
-
-#: src/keyring.c:1610
-msgid "Detailed"
-msgstr "ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½Ð¾"
-
-#: src/keyring.c:1610
-msgid "Show Key Details"
-msgstr "ÐŸÐ¾Ð´Ñ€Ð¾Ð±Ð½Ñ‹Ð¹ ÑÐ¿Ð¸ÑÐ¾Ðº ÐºÐ»ÑŽÑ‡ÐµÐ¹"
-
-#: src/keyring.c:1611
-msgid "detailed"
-msgstr "Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ñ‹Ð¹"
-
-#: src/keyring.c:1639
-msgid "Refresh the keyring"
-msgstr "ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ²ÑÐ·ÐºÑƒ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
-
-#: src/keyring.c:1640
-msgid "refresh keyring"
-msgstr "Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ²ÑÐ·ÐºÑƒ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
-
-#: src/keyring.c:1711
 msgid "Selected default key:"
 msgstr "ÐšÐ»ÑŽÑ‡ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ:"
 
-#: src/keyring.c:1721
+#: src/keyring.c:1588
 msgid "No default key selected in the preferences."
 msgstr "Ð’ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ°Ñ… Ð½Ðµ Ð²Ñ‹Ð±Ñ€Ð°Ð½ ÐºÐ»ÑŽÑ‡ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ."
 
-#: src/keyring.c:1833
+#: src/keyring.c:1701
 msgid "GNU Privacy Assistant - Keyring Editor"
 msgstr "GNU Privacy Assistant - ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
 
-#: src/keyring.c:1865
+#: src/keyring.c:1728
 msgid "Keyring Editor"
 msgstr "ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
 
-#: src/keysigndlg.c:60
+#: src/keysigndlg.c:59
 msgid "Sign Key"
 msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÑŒ ÐºÐ»ÑŽÑ‡Ð°"
 
-#: src/keysigndlg.c:76
+#: src/keysigndlg.c:72
 msgid "Do you want to sign the following key?"
 msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ ÑÑ‚Ð¾Ñ‚ ÐºÐ»ÑŽÑ‡?"
 
-#: src/keysigndlg.c:120
+#: src/keysigndlg.c:116
 msgid ""
 "Check the name and fingerprint carefully to be sure that it really is the "
 "key you want to sign."
@@ -1839,19 +1542,19 @@
 "Ð¢Ñ‰Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð¾ ÑÐ²ÐµÑ€ÑŒÑ‚Ðµ Ð¸Ð¼Ñ Ð¸ Ð¾Ñ‚Ð¿ÐµÑ‡Ð°Ñ‚Ð¾Ðº ÐºÐ»ÑŽÑ‡Ð°. ÐÑƒÐ¶Ð½Ð¾ Ð±Ñ‹Ñ‚ÑŒ ÑƒÐ²ÐµÑ€ÐµÐ½Ð½Ñ‹Ð¼, Ñ‡Ñ‚Ð¾ Ð²Ñ‹ "
 "Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‹Ð²Ð°ÐµÑ‚Ðµ Ð¸Ð¼ÐµÐ½Ð½Ð¾ Ñ‚Ð¾Ñ‚ ÐºÐ»ÑŽÑ‡, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¹ Ñ…Ð¾Ñ‚Ð¸Ñ‚Ðµ."
 
-#: src/keysigndlg.c:128
+#: src/keysigndlg.c:124
 msgid "All user names in this key will be signed."
 msgstr "Ð’ÑÐµ Ð¸Ð¼ÐµÐ½Ð° Ð² ÐºÐ»ÑŽÑ‡Ðµ Ð±ÑƒÐ´ÑƒÑ‚ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ‹."
 
-#: src/keysigndlg.c:134
+#: src/keysigndlg.c:130
 msgid "The key will be signed with your default private key."
 msgstr "ÐšÐ»ÑŽÑ‡ Ð±ÑƒÐ´ÐµÑ‚ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½ Ð²Ð°ÑˆÐ¸Ð¼ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¼ ÐºÐ»ÑŽÑ‡Ð¾Ð¼ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ."
 
-#: src/keysigndlg.c:141
+#: src/keysigndlg.c:137
 msgid "Sign only _locally"
 msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ð¾"
 
-#: src/options.c:312
+#: src/options.c:323
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -1859,36 +1562,36 @@
 "Ð—Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð±Ð¾Ð»ÐµÐµ Ð½Ðµ Ð´Ð¾ÑÑ‚ÑƒÐ¿ÐµÐ½.\n"
 "GPA Ð¿Ð¾Ð¿Ñ‹Ñ‚Ð°ÐµÑ‚ÑÑ Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ Ð²Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ."
 
-#: src/ownertrustdlg.c:106
+#: src/ownertrustdlg.c:107
 msgid "Change key ownertrust"
 msgstr "Ð¡Ð¼ÐµÐ½Ð° Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ"
 
-#: src/ownertrustdlg.c:130
+#: src/ownertrustdlg.c:131
 msgid "_Unknown"
 msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð¾"
 
-#: src/ownertrustdlg.c:135
+#: src/ownertrustdlg.c:136
 msgid ""
 "You don't know how much to trust this user to verify other people's keys.\n"
 msgstr ""
 "ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð¾, Ð¼Ð¾Ð¶Ð½Ð¾ Ð»Ð¸ Ð´Ð¾Ð²ÐµÑ€ÑÑ‚ÑŒ ÑÑ‚Ð¾Ð¼Ñƒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŽ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ‹Ð²Ð°Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸ Ð´Ñ€ÑƒÐ³Ð¸Ñ… "
 "Ð»ÑŽÐ´ÐµÐ¹.\n"
 
-#: src/ownertrustdlg.c:145
+#: src/ownertrustdlg.c:146
 msgid "_Never"
 msgstr "ÐÐµÑ‚"
 
-#: src/ownertrustdlg.c:150
+#: src/ownertrustdlg.c:151
 msgid ""
 "You don't trust this user at all to verify the validity of other people's "
 "keys at all.\n"
 msgstr "ÐÐ¸ÐºÐ°ÐºÐ¾Ð³Ð¾ Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ ÑÑ‚Ð¾Ð¼Ñƒ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŽ.\n"
 
-#: src/ownertrustdlg.c:160
+#: src/ownertrustdlg.c:161
 msgid "_Marginal"
 msgstr "ÐžÐ³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð½Ð¾Ðµ"
 
-#: src/ownertrustdlg.c:165
+#: src/ownertrustdlg.c:166
 msgid ""
 "You don't trust this user's ability to verify the validity of other people's "
 "keys enough to consider keys valid based on his/her sole word.\n"
@@ -1901,11 +1604,11 @@
 "ÐžÐ´Ð½Ð°ÐºÐ¾ ÐµÑÐ»Ð¸ ÐµÑ‰Ðµ Ð¼Ð¸Ð½Ð¸Ð¼ÑƒÐ¼ Ð´Ð²Ð¾Ðµ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ñ Ñ‚Ð°ÐºÐ¸Ð¼ Ð¶Ðµ ÑƒÑ€Ð¾Ð²Ð½ÐµÐ¼ Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ "
 "Ð¿Ð¾Ð´Ð¿Ð¸ÑˆÑƒÑ‚ Ñ‚Ð¾Ñ‚ Ð¶Ðµ ÐºÐ»ÑŽÑ‡, Ñ‚Ð°ÐºÐ¾Ð¹ ÐºÐ»ÑŽÑ‡ Ð¼Ð¾Ð¶Ð½Ð¾ Ð±ÑƒÐ´ÐµÑ‚ ÑÑ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ð´Ð¾ÑÑ‚Ð¾Ð²ÐµÑ€Ð½Ñ‹Ð¼\n"
 
-#: src/ownertrustdlg.c:182
+#: src/ownertrustdlg.c:183
 msgid "_Full"
 msgstr "ÐŸÐ¾Ð»Ð½Ð¾Ðµ"
 
-#: src/ownertrustdlg.c:187
+#: src/ownertrustdlg.c:188
 msgid ""
 "You trust this user's ability to verify the validity of other people's keys "
 "so much, that you'll consider valid any key signed by him/her, provided this "
@@ -1914,11 +1617,11 @@
 "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ Ð¾Ð±Ð»Ð°Ð´Ð°ÐµÑ‚ Ð´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ñ‹Ð¼ ÑƒÑ€Ð¾Ð²Ð½ÐµÐ¼ Ð´Ð¾Ð²ÐµÑ€Ð¸Ñ. ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ð½Ð½Ñ‹Ðµ Ð¸Ð¼ Ñ‡ÑƒÐ¶Ð¸Ðµ "
 "ÐºÐ»ÑŽÑ‡Ð¸ Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ Ð´Ð¾ÑÑ‚Ð¾Ð²ÐµÑ€Ð½Ñ‹Ð¼Ð¸.\n"
 
-#: src/ownertrustdlg.c:200
+#: src/ownertrustdlg.c:201
 msgid "U_ltimate"
 msgstr "ÐÐ±ÑÐ¾Ð»ÑŽÑ‚Ð½Ð¾Ðµ"
 
-#: src/ownertrustdlg.c:205
+#: src/ownertrustdlg.c:206
 msgid ""
 "You consider this key valid, and trust the user so much that you will "
 "consider any key signed by him/her fully valid.\n"
@@ -2008,34 +1711,145 @@
 "ÐžÑ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚ Ð¿Ð»Ð°Ð³Ð¸Ð½ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð»Ð°\n"
 "Ð´Ð»Ñ ÑÐ²ÑÐ·Ð¸ Ñ ÑÐµÑ€Ð²ÐµÑ€Ð¾Ð¼ ÐºÐ»ÑŽÑ‡ÐµÐ¹."
 
-#: src/server_access.c:528 src/server_access.c:574
+#: src/server_access.c:528 src/server_access.c:572
 msgid "The keyserver you specified is not valid"
 msgstr "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾ Ð·Ð°Ð´Ð°Ð½ ÑÐµÑ€Ð²ÐµÑ€ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
 
-#: src/settingsdlg.c:59
+#: src/settingsdlg.c:133 src/siglist.c:135
+msgid "Local"
+msgstr "Ð›Ð¾ÐºÐ°Ð»."
+
+#: src/settingsdlg.c:134
+msgid "Local, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:135
+#, fuzzy
+msgid "Local, PKA"
+msgstr "Ð›Ð¾ÐºÐ°Ð»."
+
+#: src/settingsdlg.c:136
+msgid "Local, PKA, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:137
+msgid "Local, Keyserver, PKA"
+msgstr ""
+
+#: src/settingsdlg.c:138
+#, fuzzy
+msgid "Local, kDNS"
+msgstr "Ð›Ð¾ÐºÐ°Ð»."
+
+#: src/settingsdlg.c:139
+msgid "Local, kDNS, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:140
+msgid "PKA"
+msgstr ""
+
+#: src/settingsdlg.c:141
+msgid "kDNS"
+msgstr ""
+
+#: src/settingsdlg.c:142
+msgid "Custom"
+msgstr ""
+
+#: src/settingsdlg.c:208
+#, fuzzy
+msgid "<b>User interface</b>"
+msgstr "<b>Ð Ð°Ñ_ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ‹Ð¹ Ñ€ÐµÐ¶Ð¸Ð¼</b>"
+
+#: src/settingsdlg.c:215
+#, fuzzy
+msgid "Use _advanced mode"
+msgstr "<b>Ð Ð°Ñ_ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ‹Ð¹ Ñ€ÐµÐ¶Ð¸Ð¼</b>"
+
+#: src/settingsdlg.c:221
+msgid "Show advanced _options"
+msgstr ""
+
+#: src/settingsdlg.c:272
+msgid ""
+"No default key has been selected.  This may lead to problems when signing or "
+"encrypting.  For example you might later not be able to read a mail written "
+"by you and encrypted to someone else.\n"
+"\n"
+"Please consider creating your own key and select it then."
+msgstr ""
+
+#: src/settingsdlg.c:278
+msgid "Continue without a default key"
+msgstr ""
+
+#: src/settingsdlg.c:280
+#, fuzzy
+msgid "Let me select a default key"
+msgstr "ÐšÐ»ÑŽÑ‡ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ:"
+
+#: src/settingsdlg.c:305
 msgid "<b>Default _key</b>"
 msgstr "<b>_ÐšÐ»ÑŽÑ‡ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ</b>"
 
-#: src/settingsdlg.c:111
+#: src/settingsdlg.c:405
 msgid "<b>Default key_server</b>"
 msgstr "<b>_Ð¡ÐµÑ€Ð²ÐµÑ€ ÐºÐ»ÑŽÑ‡ÐµÐ¹ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ</b>"
 
-#: src/settingsdlg.c:158
-msgid "<b>Use _advanced mode</b>"
-msgstr "<b>Ð Ð°Ñ_ÑˆÐ¸Ñ€ÐµÐ½Ð½Ñ‹Ð¹ Ñ€ÐµÐ¶Ð¸Ð¼</b>"
+#: src/settingsdlg.c:602
+#, fuzzy
+msgid "<b>Auto key _locate</b>"
+msgstr "<b>_Ð¡ÐµÑ€Ð²ÐµÑ€ ÐºÐ»ÑŽÑ‡ÐµÐ¹ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ</b>"
 
-#: src/settingsdlg.c:193
-msgid "Settings"
-msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
+#: src/settingsdlg.c:612
+msgid ""
+"The list of methods to locate keys via an email address.\n"
+"All given methods are used in turn until a matching key is found.  The "
+"supported methods are:\n"
+" Local\n"
+"   - Use the local keyring.\n"
+" Keyserver\n"
+"   - Use the default keyserver.\n"
+" PKA\n"
+"   - Use the Public Key Association.\n"
+" kDNS\n"
+"   - Use kDNS with the nameserver below.\n"
+" Custom\n"
+"   - Configured in the backend dialog.\n"
+msgstr ""
 
+#: src/settingsdlg.c:627
+msgid "Method:"
+msgstr ""
+
+#: src/settingsdlg.c:644
+msgid "The IP address of the nameserver used for the kDNS method."
+msgstr ""
+
+#: src/settingsdlg.c:646
+#, fuzzy
+msgid "kDNS Server:"
+msgstr "/_Ð¡ÐµÑ€Ð²ÐµÑ€"
+
+#: src/settingsdlg.c:740
+#, fuzzy
+msgid "The URL given for the keyserver is not valid."
+msgstr "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾ Ð·Ð°Ð´Ð°Ð½ ÑÐµÑ€Ð²ÐµÑ€ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
+
+#: src/settingsdlg.c:749
+msgid "The data given for \"Auto key locate\" is not valid."
+msgstr ""
+
+#: src/settingsdlg.c:886
+#, fuzzy
+msgid "GNU Privacy Assistant - Settings"
+msgstr "GNU Privacy Assistant - ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
+
 #: src/siglist.c:128
 msgid "Level"
 msgstr "Ð£Ñ€Ð¾Ð²ÐµÐ½ÑŒ"
 
-#: src/siglist.c:135
-msgid "Local"
-msgstr "Ð›Ð¾ÐºÐ°Ð»."
-
 #: src/verifydlg.c:116
 msgid "Verify documents"
 msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ñ‹"
@@ -2062,3 +1876,332 @@
 msgid "Signatures:"
 msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ¸:"
 
+#~ msgid "/File/C_lear"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/Ðž_Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/_ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ"
+
+#~ msgid "/File/Save _As"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/Ð¡Ð¾_Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ ÐºÐ°Ðº"
+
+#~ msgid "/File/sep1"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/sep1"
+
+#~ msgid "/File/_Sign"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/_ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ"
+
+#~ msgid "/File/_Verify"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/ÐŸÑ€Ð¾Ð²_ÐµÑ€Ð¸Ñ‚ÑŒ"
+
+#~ msgid "/File/_Encrypt"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/_Ð—Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
+
+#~ msgid "/File/_Decrypt"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/_Ð Ð°ÑÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
+
+#~ msgid "/File/sep2"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/sep2"
+
+#~ msgid "/File/_Close"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/Ð—Ð°_ÐºÑ€Ñ‹Ñ‚ÑŒ"
+
+#~ msgid "/File/_Quit"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/_Ð’Ñ‹Ð¹Ñ‚Ð¸"
+
+#~ msgid "/Edit/_Undo"
+#~ msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
+
+#~ msgid "/Edit/_Redo"
+#~ msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/Ð’_ÐµÑ€Ð½ÑƒÑ‚ÑŒ"
+
+#~ msgid "/Edit/sep0"
+#~ msgstr "/Edit/sep0"
+
+#~ msgid "/Edit/Cut"
+#~ msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/Ð’Ñ‹Ñ€ÐµÐ·Ð°Ñ‚ÑŒ"
+
+#~ msgid "/Edit/_Copy"
+#~ msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
+
+#~ msgid "/Edit/_Paste"
+#~ msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_Ð’ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ"
+
+#~ msgid "/Edit/_Delete"
+#~ msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
+
+#~ msgid "/Edit/sep1"
+#~ msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/sep1"
+
+#~ msgid "/Edit/Select _All"
+#~ msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/Ð’Ñ‹_Ð±Ñ€Ð°Ñ‚ÑŒ Ð²ÑÐµ"
+
+#~ msgid "/Edit/sep2"
+#~ msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/sep2"
+
+#~ msgid "/Edit/Pr_eferences..."
+#~ msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸..."
+
+#~ msgid "/Edit/_Backend Preferences..."
+#~ msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ _ÑˆÐ¸Ñ„Ñ€. Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹..."
+
+#~ msgid "/_Windows"
+#~ msgstr "/_ÐžÐºÐ½Ð¾"
+
+#~ msgid "/Windows/_Keyring Editor"
+#~ msgstr "/ÐžÐºÐ½Ð¾/ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ _ÐºÐ»ÑŽÑ‡ÐµÐ¹"
+
+#~ msgid "/Windows/_Filemanager"
+#~ msgstr "/ÐžÐºÐ½Ð¾/ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ _Ñ„Ð°Ð¹Ð»Ð¾Ð²"
+
+#~ msgid "/Windows/_Clipboard"
+#~ msgstr "/ÐžÐºÐ½Ð¾/_Ð‘ÑƒÑ„ÐµÑ€"
+
+#~ msgid "/Edit/Copy"
+#~ msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
+
+#~ msgid "/Edit/Paste"
+#~ msgstr "/ÐŸÑ€Ð°Ð²ÐºÐ°/_Ð’ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ"
+
+#~ msgid "clear buffer"
+#~ msgstr "Ð¾Ñ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ Ð±ÑƒÑ„ÐµÑ€"
+
+#~ msgid "open file"
+#~ msgstr "Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»"
+
+#~ msgid "save file as"
+#~ msgstr "ÑÐ¾Ñ…Ñ€Ð°Ð½Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» ÐºÐ°Ðº"
+
+#~ msgid "cut the selection"
+#~ msgstr "Ð²Ñ‹Ñ€ÐµÐ·Ð°Ñ‚ÑŒ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ðµ Ð² Ð±ÑƒÑ„ÐµÑ€"
+
+#~ msgid "copy the selection"
+#~ msgstr "ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð½Ð¾Ðµ Ð² Ð±ÑƒÑ„ÐµÑ€"
+
+#~ msgid "paste the clipboard"
+#~ msgstr "Ð²ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ Ð¸Ð· Ð±ÑƒÑ„ÐµÑ€Ð°"
+
+#~ msgid "Sign the selected text"
+#~ msgstr "ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ð¹ Ñ‚ÐµÐºÑÑ‚"
+
+#~ msgid "verify text"
+#~ msgstr "Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ñ‚ÐµÐºÑÑ‚"
+
+#~ msgid "encrypt text"
+#~ msgstr "Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ‚ÐµÐºÑÑ‚"
+
+#~ msgid "decrypt text"
+#~ msgstr "Ñ€Ð°ÑÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ‚ÐµÐºÑÑ‚"
+
+#~ msgid "preferences"
+#~ msgstr "Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ"
+
+#~ msgid "Open the keyring editor"
+#~ msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
+
+#~ msgid "keyring editor"
+#~ msgstr "Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
+
+#~ msgid "Open the file manager"
+#~ msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€ Ñ„Ð°Ð¹Ð»Ð¾Ð²"
+
+#~ msgid "file manager"
+#~ msgstr "Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€ Ñ„Ð°Ð¹Ð»Ð¾Ð²"
+
+#~ msgid "Help"
+#~ msgstr "Ð¡Ð¿Ñ€Ð°Ð²ÐºÐ°"
+
+#~ msgid "help"
+#~ msgstr "ÑÐ¿Ñ€Ð°Ð²ÐºÐ°"
+
+#~ msgid "/File/Sign"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ"
+
+#~ msgid "/File/Verify"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ"
+
+#~ msgid "/File/Encrypt"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/Ð—Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
+
+#~ msgid "/File/Decrypt"
+#~ msgstr "/Ð¤Ð°Ð¹Ð»/Ð Ð°ÑÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
+
+#~ msgid "close files"
+#~ msgstr "Ð·Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»Ñ‹"
+
+#~ msgid "sign file"
+#~ msgstr "Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»"
+
+#~ msgid "verify file"
+#~ msgstr "Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»"
+
+#~ msgid "encrypt file"
+#~ msgstr "Ð·Ð°ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»"
+
+#~ msgid "decrypt file"
+#~ msgstr "Ñ€Ð°ÑÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»"
+
+#~ msgid "Open the clipboard"
+#~ msgstr "ÐžÑ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð±ÑƒÑ„ÐµÑ€"
+
+#~ msgid "clipboard"
+#~ msgstr "Ð±ÑƒÑ„ÐµÑ€"
+
+#~ msgid "_Back"
+#~ msgstr "_ÐÐ°Ð·Ð°Ð´"
+
+#~ msgid "_Forward"
+#~ msgstr "_Ð”Ð°Ð»ÐµÐµ"
+
+#~ msgid "_Apply"
+#~ msgstr "_ÐŸÑ€Ð¸Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
+
+#~ msgid "Brought to you by:"
+#~ msgstr "ÐŸÑ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½:"
+
+#~ msgid "GPA is Free Software under the"
+#~ msgstr "GPA - Ð±ÐµÑÐ¿Ð»Ð°Ñ‚Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ð¿Ð¾ Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ð¸"
+
+#~ msgid "GNU General Public License."
+#~ msgstr "GNU General Public License."
+
+#~ msgid "For news see:"
+#~ msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ:"
+
+#~ msgid "http://www.gpg4win.org"
+#~ msgstr "http://www.gpg4win.org"
+
+#~ msgid "http://www.gnupg.org"
+#~ msgstr "http://www.gnupg.org"
+
+#~ msgid "GNU General Public License"
+#~ msgstr "GNU General Public License"
+
+#~ msgid "_GNU General Public License"
+#~ msgstr "_GNU General Public License"
+
+#~ msgid "Show Help Text\n"
+#~ msgstr "ÐŸÐ¾ÐºÐ°Ð·Ð°Ñ‚ÑŒ Ð¿Ð¾Ð´ÑÐºÐ°Ð·ÐºÐ¸\n"
+
+#~ msgid "/_Help"
+#~ msgstr "/Ð¡Ð¿_Ñ€Ð°Ð²ÐºÐ°"
+
+#~ msgid "/Help/_Contents"
+#~ msgstr "/Ð¡Ð¿Ñ€Ð°Ð²ÐºÐ°/_Ð¡Ð¾Ð´ÐµÑ€Ð¶Ð°Ð½Ð¸Ðµ"
+
+#~ msgid "/Help/_License"
+#~ msgstr "/Ð¡Ð¿Ñ€Ð°Ð²ÐºÐ°/_Ð›Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/Ð¡Ð¿Ñ€Ð°Ð²ÐºÐ°/_Ðž Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ðµ"
+
+#~ msgid "Please insert your name"
+#~ msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÑÐ²Ð¾Ðµ Ð¸Ð¼Ñ (Ð°Ð½Ð³Ð».)"
+
+#~ msgid "Please insert your email address"
+#~ msgstr "Ð’Ð²ÐµÐ´Ð¸Ñ‚Ðµ ÑÐ²Ð¾Ð¹ Ð°Ð´Ñ€ÐµÑ email"
+
+#~ msgid "/Keys/_Refresh"
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
+
+#~ msgid "/Keys/sep0"
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/sep0"
+
+#~ msgid "/Keys/_Delete Keys..."
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ..."
+
+#~ msgid "/Keys/sep1"
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/sep1"
+
+#~ msgid "/Keys/_Sign Keys..."
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ..."
+
+#~ msgid "/Keys/Set _Owner Trust..."
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_Ð”Ð¾Ð²ÐµÑ€Ð¸Ðµ..."
+
+#~ msgid "/Keys/_Edit Private Key..."
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ..."
+
+#~ msgid "/Keys/sep2"
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/sep2"
+
+#~ msgid "/Keys/_Import Keys..."
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_Ð˜Ð¼Ð¿Ð¾Ñ€Ñ‚..."
+
+#~ msgid "/Keys/E_xport Keys..."
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/_ÐÐºÑÐ¿Ð¾Ñ€Ñ‚..."
+
+#~ msgid "/Keys/_Backup..."
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/Ð Ðµ_Ð·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ..."
+
+#~ msgid "/Server/_Send Keys..."
+#~ msgstr "/Ð¡ÐµÑ€Ð²ÐµÑ€/_ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
+
+#~ msgid "/Windows/_File Manager"
+#~ msgstr "/_ÐžÐºÐ½Ð¾/ÐœÐµÐ½ÐµÐ´Ð¶ÐµÑ€ _Ñ„Ð°Ð¹Ð»Ð¾Ð²"
+
+#~ msgid "/Keys/Export Keys..."
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/ÐÐºÑÐ¿Ð¾Ñ€Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
+
+#~ msgid "/Keys/Delete Keys..."
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
+
+#~ msgid "/Server/Send Keys..."
+#~ msgstr "/Ð¡ÐµÑ€Ð²ÐµÑ€/ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
+
+#~ msgid "/Keys/Set Owner Trust..."
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/Ð”Ð¾Ð²ÐµÑ€Ð¸Ðµ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ñƒ..."
+
+#~ msgid "/Keys/Sign Keys..."
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡..."
+
+#~ msgid "/Keys/Edit Private Key..."
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡..."
+
+#~ msgid "/Keys/Backup..."
+#~ msgstr "/ÐšÐ»ÑŽÑ‡Ð¸/Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ..."
+
+#~ msgid "/_Copy"
+#~ msgstr "/ÐšÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
+
+#~ msgid "/_Paste"
+#~ msgstr "/Ð’ÑÑ‚Ð°Ð²Ð¸Ñ‚ÑŒ"
+
+#~ msgid "/Set Owner Trust..."
+#~ msgstr "/Ð”Ð¾Ð²ÐµÑ€Ð¸Ðµ Ð²Ð»Ð°Ð´ÐµÐ»ÑŒÑ†Ñƒ..."
+
+#~ msgid "/Sign Keys..."
+#~ msgstr "/ÐŸÐ¾Ð´Ð¿Ð¸ÑÐ°Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡Ð¸..."
+
+#~ msgid "/Edit Private Key..."
+#~ msgstr "/Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ñ‹Ð¹ ÐºÐ»ÑŽÑ‡..."
+
+#~ msgid "/Backup..."
+#~ msgstr "/Ð ÐµÐ·ÐµÑ€Ð²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ..."
+
+#~ msgid "edit key"
+#~ msgstr "Ð¿Ñ€Ð°Ð²ÐºÐ° ÐºÐ»ÑŽÑ‡Ð°"
+
+#~ msgid "remove key"
+#~ msgstr "ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ ÐºÐ»ÑŽÑ‡"
+
+#~ msgid "sign key"
+#~ msgstr "Ð¿Ð¾Ð´Ð¿Ð¸ÑÑŒ ÐºÐ»ÑŽÑ‡Ð°"
+
+#~ msgid "import keys"
+#~ msgstr "Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
+
+#~ msgid "export keys"
+#~ msgstr "ÑÐºÑÐ¿Ð¾Ñ€Ñ‚ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
+
+#~ msgid "brief"
+#~ msgstr "ÐºÑ€Ð°Ñ‚ÐºÐ¾"
+
+#~ msgid "detailed"
+#~ msgstr "Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ñ‹Ð¹"
+
+#~ msgid "refresh keyring"
+#~ msgstr "Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÐ²ÑÐ·ÐºÑƒ ÐºÐ»ÑŽÑ‡ÐµÐ¹"
+
+#~ msgid "Settings"
+#~ msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"

Modified: trunk/po/sv.po
===================================================================
--- trunk/po/sv.po	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/sv.po	2008-05-08 12:53:41 UTC (rev 891)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.7.0\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-03-12 12:29+0100\n"
+"POT-Creation-Date: 2008-05-08 14:51+0200\n"
 "PO-Revision-Date: 2007-02-17 12:50+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -17,425 +17,212 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: src/clipboard.c:367 src/fileman.c:350
+#: src/clipboard.c:376 src/fileman.c:392
 msgid "Open File"
 msgstr "Öppna fil"
 
-#: src/clipboard.c:395 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "GPA-meddelande"
 
 #. TRANSLATORS: The arguments are the filename, the integer size
 #. and the unit (such as KB or MB).
-#: src/clipboard.c:412
+#: src/clipboard.c:421
 #, fuzzy, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
 msgstr ""
 "Filen %s finns redan.\n"
 "Vill du skriva över den?"
 
-#: src/clipboard.c:481
+#: src/clipboard.c:542
 msgid "Save As..."
 msgstr ""
 
-#: src/clipboard.c:522 src/clipboard.c:552 src/clipboard.c:582
-#: src/clipboard.c:612 src/clipboard.c:1113 src/fileman.c:675
-#: src/keyring.c:1657
+#: src/clipboard.c:583 src/clipboard.c:613 src/clipboard.c:643
+#: src/clipboard.c:673 src/clipboard.c:1034
 msgid "Clipboard"
 msgstr ""
 
-#: src/clipboard.c:692 src/fileman.c:472 src/keyring.c:863
-msgid "/_File"
+#: src/clipboard.c:755 src/fileman.c:515 src/keyring.c:884
+#, fuzzy
+msgid "_File"
 msgstr "/_Arkiv"
 
-#: src/clipboard.c:693 src/fileman.c:474
-msgid "/File/C_lear"
-msgstr "/Arkiv/_Töm"
-
-#: src/clipboard.c:694 src/fileman.c:473
-msgid "/File/_Open"
-msgstr "/Arkiv/_Öppna"
-
-#: src/clipboard.c:695
+#: src/clipboard.c:756 src/fileman.c:516 src/keyring.c:885
 #, fuzzy
-msgid "/File/Save _As"
-msgstr "/Arkiv/Stä_ng"
-
-#: src/clipboard.c:697 src/fileman.c:475
-msgid "/File/sep1"
-msgstr "/Arkiv/sep1"
-
-#: src/clipboard.c:698 src/fileman.c:476
-msgid "/File/_Sign"
-msgstr "/Arkiv/_Signera"
-
-#: src/clipboard.c:699 src/fileman.c:477
-msgid "/File/_Verify"
-msgstr "/Arkiv/_Validera"
-
-#: src/clipboard.c:700 src/fileman.c:478
-msgid "/File/_Encrypt"
-msgstr "/Arkiv/_Kryptera"
-
-#: src/clipboard.c:701 src/fileman.c:479
-msgid "/File/_Decrypt"
-msgstr "/Arkiv/_Dekryptera"
-
-#: src/clipboard.c:702 src/fileman.c:480
-msgid "/File/sep2"
-msgstr "/Arkiv/sep2"
-
-#: src/clipboard.c:703 src/fileman.c:481 src/keyring.c:864
-msgid "/File/_Close"
-msgstr "/Arkiv/Stä_ng"
-
-#: src/clipboard.c:704 src/fileman.c:482 src/keyring.c:866
-msgid "/File/_Quit"
-msgstr "/Arkiv/A_vsluta"
-
-#: src/clipboard.c:707 src/fileman.c:485 src/keyring.c:869
-msgid "/_Edit"
+msgid "_Edit"
 msgstr "/R_edigera"
 
-#: src/clipboard.c:710
-#, fuzzy
-msgid "/Edit/_Undo"
-msgstr "/Redigera/_Kopiera"
-
-#: src/clipboard.c:711
-#, fuzzy
-msgid "/Edit/_Redo"
-msgstr "/Redigera/_Kopiera"
-
-#: src/clipboard.c:712
-#, fuzzy
-msgid "/Edit/sep0"
-msgstr "/Redigera/sep2"
-
-#: src/clipboard.c:714 src/clipboard.c:750
-#, fuzzy
-msgid "/Edit/Cut"
-msgstr "/Redigera/Kopiera"
-
-#: src/clipboard.c:715 src/keyring.c:870
-msgid "/Edit/_Copy"
-msgstr "/Redigera/_Kopiera"
-
-#: src/clipboard.c:716 src/keyring.c:872
-msgid "/Edit/_Paste"
-msgstr "/Redigera/Klistra _in"
-
-#: src/clipboard.c:717
-#, fuzzy
-msgid "/Edit/_Delete"
-msgstr "/Redigera/Klistra _in"
-
-#: src/clipboard.c:718 src/keyring.c:874
-msgid "/Edit/sep1"
-msgstr "/Redigera/sep1"
-
-#: src/clipboard.c:719 src/fileman.c:486 src/keyring.c:875
-msgid "/Edit/Select _All"
-msgstr "/Redigera/Markera _allt"
-
-#: src/clipboard.c:721 src/fileman.c:487 src/keyring.c:876
-msgid "/Edit/sep2"
-msgstr "/Redigera/sep2"
-
-#: src/clipboard.c:722 src/fileman.c:488 src/keyring.c:877
-msgid "/Edit/Pr_eferences..."
-msgstr "/Redigera/_Inställningar"
-
-#: src/clipboard.c:724 src/fileman.c:490 src/keyring.c:879
-#, fuzzy
-msgid "/Edit/_Backend Preferences..."
-msgstr "/Redigera/_Inställningar"
-
-#: src/clipboard.c:728 src/fileman.c:494 src/keyring.c:906
-msgid "/_Windows"
-msgstr "/_Fönster"
-
-#: src/clipboard.c:729 src/fileman.c:495 src/keyring.c:907
-msgid "/Windows/_Keyring Editor"
-msgstr "/Fönster/_Nyckelringshanterare"
-
-#: src/clipboard.c:730 src/fileman.c:496
-msgid "/Windows/_Filemanager"
-msgstr "/Fönster/_Filhanterare"
-
-#: src/clipboard.c:731 src/fileman.c:497 src/keyring.c:909
-#, fuzzy
-msgid "/Windows/_Clipboard"
-msgstr "/Fönster/_Filhanterare"
-
-#: src/clipboard.c:758 src/keyring.c:948
-msgid "/Edit/Copy"
-msgstr "/Redigera/Kopiera"
-
-#: src/clipboard.c:766
-#, fuzzy
-msgid "/Edit/Delete"
-msgstr "/Redigera/Markera _allt"
-
-#: src/clipboard.c:774
-#, fuzzy
-msgid "/Edit/Paste"
-msgstr "/Redigera/Klistra _in"
-
-#: src/clipboard.c:879
+#: src/clipboard.c:760
 msgid "Clear buffer"
 msgstr ""
 
-#: src/clipboard.c:879
-msgid "clear buffer"
-msgstr ""
-
-#: src/clipboard.c:887 src/fileman.c:602
+#: src/clipboard.c:762 src/fileman.c:520
 msgid "Open a file"
 msgstr "Öppna en fil"
 
-#: src/clipboard.c:887 src/fileman.c:602
-msgid "open file"
-msgstr "öppna fil"
-
-#: src/clipboard.c:892
+#: src/clipboard.c:764
 #, fuzzy
 msgid "Save to a file"
 msgstr "Öppna en fil"
 
-#: src/clipboard.c:892
+#: src/clipboard.c:766
 #, fuzzy
-msgid "save file as"
-msgstr "stäng filer"
+msgid "Sign buffer text"
+msgstr "signera nyckel"
 
-#: src/clipboard.c:900
+#: src/clipboard.c:768
 #, fuzzy
-msgid "Cut the selection"
-msgstr "Kryptera markerad fil"
+msgid "Check signatures of buffer text"
+msgstr "Kontrollera signatur på markerad fil"
 
-#: src/clipboard.c:901
+#: src/clipboard.c:770
 #, fuzzy
-msgid "cut the selection"
+msgid "Encrypt the buffer text"
 msgstr "Kryptera markerad fil"
 
-#: src/clipboard.c:907
+#: src/clipboard.c:772
 #, fuzzy
-msgid "Copy the selection"
-msgstr "Kryptera markerad fil"
+msgid "Decrypt the buffer text"
+msgstr "Dekryptera markerad fil"
 
-#: src/clipboard.c:908
-#, fuzzy
-msgid "copy the selection"
-msgstr "Kryptera markerad fil"
-
-#: src/clipboard.c:914
-msgid "Paste the clipboard"
+#: src/clipboard.c:774
+msgid "Close the buffer"
 msgstr ""
 
-#: src/clipboard.c:915
-msgid "paste the clipboard"
+#: src/clipboard.c:776 src/fileman.c:534 src/keyring.c:893
+msgid "Quit the program"
 msgstr ""
 
-#: src/clipboard.c:925 src/fileman.c:612 src/keyring.c:1570
-msgid "Sign"
-msgstr "Signera"
-
-#: src/clipboard.c:926
+#: src/clipboard.c:782
 #, fuzzy
-msgid "Sign the selected text"
-msgstr "Signera vald nyckel"
+msgid "Undo the last action"
+msgstr "Kryptera markerad fil"
 
-#: src/clipboard.c:927
-#, fuzzy
-msgid "sign text"
-msgstr "signera nyckel"
+#: src/clipboard.c:784
+msgid "Redo the last undone action"
+msgstr ""
 
-#: src/clipboard.c:935 src/fileman.c:623
-msgid "Verify"
-msgstr "Validera"
-
-#: src/clipboard.c:936
+#: src/clipboard.c:787
 #, fuzzy
-msgid "Check signatures of selected text"
-msgstr "Kontrollera signatur på markerad fil"
+msgid "Cut the selection"
+msgstr "Kryptera markerad fil"
 
-#: src/clipboard.c:937
+#: src/clipboard.c:789 src/keyring.c:897
 #, fuzzy
-msgid "verify text"
-msgstr "validera fil"
-
-#: src/clipboard.c:945 src/fileman.c:634
-msgid "Encrypt"
-msgstr "Kryptera"
-
-#: src/clipboard.c:946
-#, fuzzy
-msgid "Encrypt the selected text"
+msgid "Copy the selection"
 msgstr "Kryptera markerad fil"
 
-#: src/clipboard.c:947
-#, fuzzy
-msgid "encrypt text"
-msgstr "kryptera fil"
+#: src/clipboard.c:791 src/keyring.c:899
+msgid "Paste the clipboard"
+msgstr ""
 
-#: src/clipboard.c:955 src/fileman.c:645
-msgid "Decrypt"
-msgstr "Dekryptera"
-
-#: src/clipboard.c:956
+#: src/clipboard.c:793
 #, fuzzy
-msgid "Decrypt the selected text"
+msgid "Delete the selected text"
 msgstr "Dekryptera markerad fil"
 
-#: src/clipboard.c:957
-#, fuzzy
-msgid "decrypt text"
-msgstr "dekryptera fil"
+#: src/clipboard.c:795
+msgid "Select the entire document"
+msgstr ""
 
-#: src/clipboard.c:967 src/fileman.c:658 src/keyring.c:1631
+#: src/clipboard.c:902 src/fileman.c:625
 #, fuzzy
-msgid "Open the preferences dialog"
-msgstr "Öppna Inställningsdialogen"
-
-#: src/clipboard.c:968 src/fileman.c:659 src/keyring.c:1632
-msgid "preferences"
-msgstr "inställningar"
-
-#: src/clipboard.c:975 src/fileman.c:666
-#, fuzzy
 msgid "Keyring"
 msgstr "Nyckelringshanterare"
 
-#: src/clipboard.c:976 src/fileman.c:667
-#, fuzzy
-msgid "Open the keyring editor"
-msgstr "öppna nyckelringsredigeraren (standard)"
-
-#: src/clipboard.c:977 src/fileman.c:668
-#, fuzzy
-msgid "keyring editor"
-msgstr "Nyckelringshanterare"
-
-#: src/clipboard.c:983 src/keyring.c:1648
+#: src/clipboard.c:904 src/keyring.c:1073
 msgid "Files"
 msgstr "Filer"
 
-#: src/clipboard.c:984 src/keyring.c:1649
+#: src/clipboard.c:1004
 #, fuzzy
-msgid "Open the file manager"
-msgstr "Öppna filhanteraren"
-
-#: src/clipboard.c:985 src/keyring.c:1650
-msgid "file manager"
-msgstr "filhanterare"
-
-#: src/clipboard.c:992 src/fileman.c:684 src/keyring.c:1665
-msgid "Help"
-msgstr "Hjälp"
-
-#: src/clipboard.c:993 src/fileman.c:685 src/keyring.c:1666
-msgid "Understanding the GNU Privacy Assistant"
-msgstr "Hur GNU Privacy Assistant fungerar"
-
-#: src/clipboard.c:994 src/fileman.c:686 src/keyring.c:1667
-msgid "help"
-msgstr "hjälp"
-
-#: src/clipboard.c:1084
-#, fuzzy
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Privacy Assistant - Filhanterare"
 
-#: src/confdialog.c:993
+#: src/confdialog.c:994
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default values"
 msgstr ""
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default value"
 msgstr ""
 
-#: src/confdialog.c:1146
+#: src/confdialog.c:1147
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1155
+#: src/confdialog.c:1156
 msgid "Use default argument"
 msgstr ""
 
-#: src/confdialog.c:1280
+#: src/confdialog.c:1281
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1325
+#: src/confdialog.c:1326
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1334
+#: src/confdialog.c:1332
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1346
+#: src/confdialog.c:1351
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1350
+#: src/confdialog.c:1355
 #, fuzzy
 msgid "Level:"
 msgstr "Nivå"
 
-#: src/confdialog.c:1359
+#: src/confdialog.c:1364
 #, fuzzy
 msgid "Basic"
 msgstr "_Tillbaka"
 
-#: src/confdialog.c:1360
+#: src/confdialog.c:1365
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1361
+#: src/confdialog.c:1366
 #, fuzzy
 msgid "Expert"
 msgstr "Exportera"
 
-#: src/encryptdlg.c:142 src/expirydlg.c:116 src/filesigndlg.c:133
-#: src/gpabackupop.c:292 src/gpaprogressdlg.c:146 src/gparecvkeydlg.c:96
-#: src/gpawizard.c:289 src/gpgmetools.c:696 src/keygendlg.c:149
-#: src/ownertrustdlg.c:111 src/passwddlg.c:100
-msgid "_Cancel"
-msgstr "_Avbryt"
-
-#: src/encryptdlg.c:143
+#: src/encryptdlg.c:139
 #, fuzzy
 msgid "Encrypt documents"
 msgstr "Kryptera filer"
 
-#: src/encryptdlg.c:174
+#: src/encryptdlg.c:156
 msgid "_Public Keys"
 msgstr "_Publika nycklar"
 
-#: src/encryptdlg.c:177
+#: src/encryptdlg.c:179 src/icons.c:198
 msgid "_Sign"
 msgstr "_Signera"
 
-#: src/encryptdlg.c:201 src/filesigndlg.c:185
+#: src/encryptdlg.c:185
 msgid "Sign _as "
 msgstr "Signera s_om"
 
-#: src/encryptdlg.c:215 src/filesigndlg.c:187
+#: src/encryptdlg.c:215 src/filesigndlg.c:227
 msgid "A_rmor"
 msgstr "ASCII-s_kal"
 
@@ -443,147 +230,100 @@
 msgid "Please provide a correct date."
 msgstr "Ange ett korrekt datum."
 
-#: src/expirydlg.c:111
+#: src/expirydlg.c:108
 msgid "Change expiry date"
 msgstr "Ändra utgångsdatum"
 
-#: src/expirydlg.c:129
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#: src/expirydlg.c:124
 msgid "_never expire"
 msgstr "_går aldrig ut"
 
-#: src/expirydlg.c:134
+#: src/expirydlg.c:129
 msgid "_expire on:"
 msgstr "går _ut den:"
 
-#: src/fileman.c:355 src/fileman.c:953
-msgid "The file is already open."
-msgstr "Filen är redan öppnad."
-
-#: src/fileman.c:516
-msgid "/File/Sign"
-msgstr "/Arkiv/Signera"
-
-#: src/fileman.c:521
-msgid "/File/Verify"
-msgstr "/Arkiv/Validera"
-
-#: src/fileman.c:526
-msgid "/File/Encrypt"
-msgstr "/Arkiv/Kryptera"
-
-#: src/fileman.c:531
-msgid "/File/Decrypt"
-msgstr "/Arkiv/Dekryptera"
-
-#: src/fileman.c:606
+#: src/fileman.c:522
 msgid "Close all files"
 msgstr "Stäng alla filer"
 
-#: src/fileman.c:606
-msgid "close files"
-msgstr "stäng filer"
-
-#: src/fileman.c:613
+#: src/fileman.c:524
 msgid "Sign the selected file"
 msgstr "Signera markerad fil"
 
-#: src/fileman.c:614
-msgid "sign file"
-msgstr "signera fil"
-
-#: src/fileman.c:624
+#: src/fileman.c:526
 msgid "Check signatures of selected file"
 msgstr "Kontrollera signatur på markerad fil"
 
-#: src/fileman.c:625
-msgid "verify file"
-msgstr "validera fil"
-
-#: src/fileman.c:635
+#: src/fileman.c:528
 msgid "Encrypt the selected file"
 msgstr "Kryptera markerad fil"
 
-#: src/fileman.c:636
-msgid "encrypt file"
-msgstr "kryptera fil"
-
-#: src/fileman.c:646
+#: src/fileman.c:530
 msgid "Decrypt the selected file"
 msgstr "Dekryptera markerad fil"
 
-#: src/fileman.c:647
-msgid "decrypt file"
-msgstr "dekryptera fil"
+#: src/fileman.c:532
+msgid "Close the window"
+msgstr ""
 
-#: src/fileman.c:676 src/keyring.c:1658
+#: src/fileman.c:538
 #, fuzzy
-msgid "Open the clipboard"
-msgstr "Öppna filhanteraren"
+msgid "Select all files"
+msgstr "Stäng alla filer"
 
-#: src/fileman.c:677 src/keyring.c:1659
-msgid "clipboard"
-msgstr ""
-
-#: src/fileman.c:785
+#: src/fileman.c:731
 msgid "File"
 msgstr "Arkiv"
 
-#: src/fileman.c:850
+#: src/fileman.c:796
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Filhanterare"
 
-#: src/fileman.c:876
+#: src/fileman.c:819
 #, fuzzy
 msgid "File Manager"
 msgstr "filhanterare"
 
-#: src/filesigndlg.c:134
+#: src/fileman.c:895
+msgid "The file is already open."
+msgstr "Filen är redan öppnad."
+
+#: src/filesigndlg.c:171
 msgid "Sign documents"
 msgstr ""
 
-#: src/filesigndlg.c:144
-msgid "Signing Mode"
+#: src/filesigndlg.c:180
+#, fuzzy
+msgid "<b>Sign _as</b>"
+msgstr "Signera s_om"
+
+#: src/filesigndlg.c:201
+#, fuzzy
+msgid "<b>Signing Mode</b>"
 msgstr "Signeringsläge"
 
-#: src/filesigndlg.c:152
-msgid "si_gn and compress"
+#: src/filesigndlg.c:211
+#, fuzzy
+msgid "Si_gn and compress"
 msgstr "signera och _komprimera"
 
-#: src/filesigndlg.c:158
-msgid "_cleartext signature"
+#: src/filesigndlg.c:217
+#, fuzzy
+msgid "Clear_text signature"
 msgstr "signatur i klar_text"
 
-#: src/filesigndlg.c:165
+#: src/filesigndlg.c:223
 #, fuzzy
-msgid "_detached signature"
+msgid "_Detached signature"
 msgstr "signatur i klar_text"
 
-#: src/gpabackupop.c:213 src/gpgmetools.c:138
+#: src/gpabackupop.c:208
 #, c-format
 msgid ""
-"The file %s already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Filen %s finns redan.\n"
-"Vill du skriva över den?"
-
-#: src/gpabackupop.c:216 src/gpaexportserverop.c:134
-#: src/gpafileencryptop.c:455 src/gpafileverifyop.c:178 src/gpgmetools.c:141
-#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:62
-#: src/settingsdlg.c:165
-msgid "_Yes"
-msgstr "_Ja"
-
-#: src/gpabackupop.c:217 src/gpaexportserverop.c:135
-#: src/gpafileencryptop.c:456 src/gpafileverifyop.c:179 src/gpgmetools.c:142
-#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:64
-#: src/settingsdlg.c:168
-msgid "_No"
-msgstr "_Nej"
-
-#: src/gpabackupop.c:229
-#, c-format
-msgid ""
 "A copy of your secret key has been made to the file:\n"
 "\n"
 "\t\"%s\"\n"
@@ -598,31 +338,19 @@
 "Detta är känslig information som bör lagras på ett noggrannt\n"
 "utvalt ställe (t.ex. på en diskett i ett kassaskåp)."
 
-#: src/gpabackupop.c:244
+#: src/gpabackupop.c:223
 msgid "An error ocurred during the backup operation."
 msgstr "Ett fel inträffade under säkerhetskopieringen."
 
-#: src/gpabackupop.c:260
+#: src/gpabackupop.c:245
 msgid "Backup key to file"
 msgstr "Säkerhetskopiera nyckel till fil"
 
-#: src/gpabackupop.c:287
-msgid "Backup Keys"
-msgstr "Säkerhetskopiera nycklar"
-
-#: src/gpabackupop.c:311
+#: src/gpabackupop.c:255
 #, c-format
 msgid "Generating backup of key: %s"
 msgstr "Skapar säkerhetskopia av nyckel: %s"
 
-#: src/gpabackupop.c:317
-msgid "_Backup to file:"
-msgstr "_Säkerhetskopiera till fil:"
-
-#: src/gpabackupop.c:329
-msgid "B_rowse..."
-msgstr "_Bläddra..."
-
 #: src/gpa.c:92
 #, fuzzy
 msgid "Output version information and exit"
@@ -643,26 +371,31 @@
 msgstr ""
 
 #: src/gpa.c:100
-msgid "Start only the UI server (implies --cms)"
+#, fuzzy
+msgid "Open the settings dialog"
+msgstr "Öppna Inställningsdialogen"
+
+#: src/gpa.c:102
+msgid "Enable the UI server (implies --cms)"
 msgstr ""
 
-#: src/gpa.c:102
+#: src/gpa.c:104
 #, fuzzy
 msgid "Read options from file"
 msgstr "läs inställningar från fil"
 
-#: src/gpa.c:293
+#: src/gpa.c:286
 msgid "[FILE...]"
 msgstr ""
 
-#: src/gpa.c:295
+#: src/gpa.c:288
 #, fuzzy
 msgid "Graphical frontend to GnuPG"
 msgstr ""
 "Syntax: gpa [flaggor]\n"
 "Grafiskt användargränssnitt till GnuPG\n"
 
-#: src/gpa.c:296
+#: src/gpa.c:289
 msgid "Please report bugs to <"
 msgstr "Rapportera fel till <"
 
@@ -670,15 +403,15 @@
 msgid "The keys have been copied to the clipboard."
 msgstr "Nycklarna har kopierats till urklipp."
 
-#: src/gpaexportfileop.c:133
+#: src/gpaexportfileop.c:139
 msgid "Export public keys to file"
 msgstr "Exportera publika nycklar till fil"
 
-#: src/gpaexportfileop.c:137
+#: src/gpaexportfileop.c:150
 msgid "_armor"
 msgstr "AS_CII-skal"
 
-#: src/gpaexportfileop.c:171
+#: src/gpaexportfileop.c:182
 #, c-format
 msgid "The keys have been exported to %s."
 msgstr "Nycklarna har exporterats till %s."
@@ -694,6 +427,18 @@
 "publik nyckelserver (\"%s\").\n"
 "Är du säker på att du vill distribuera nyckeln?"
 
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:459
+#: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
+#: src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Ja"
+
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:460
+#: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
+#: src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_Nej"
+
 #: src/gpaexportserverop.c:187
 msgid "The keys have been sent to the server."
 msgstr "Nycklarna har skickats till servern."
@@ -702,29 +447,29 @@
 msgid "Decrypting..."
 msgstr "Dekrypterar..."
 
-#: src/gpafiledecryptop.c:358 src/gpafileverifyop.c:449
+#: src/gpafiledecryptop.c:367 src/gpafileverifyop.c:464
 #, fuzzy, c-format
 msgid "\"%s\" contained no OpenPGP data."
 msgstr "Filen \"%s\" innehåller ingen OpenPGP-data."
 
-#: src/gpafiledecryptop.c:359 src/gpafileverifyop.c:450
+#: src/gpafiledecryptop.c:368 src/gpafileverifyop.c:465
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no OpenPGPdata."
 msgstr "Filen \"%s\" innehåller ingen OpenPGP-data."
 
-#: src/gpafiledecryptop.c:369
+#: src/gpafiledecryptop.c:378
 #, fuzzy, c-format
 msgid "\"%s\" contained no valid encrypted data."
 msgstr "Filen \"%s\" innehåller ingen giltigt krypterat data."
 
-#: src/gpafiledecryptop.c:371
+#: src/gpafiledecryptop.c:380
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no validencrypted data."
 msgstr "Filen \"%s\" innehåller ingen giltigt krypterat data."
 
-#: src/gpafiledecryptop.c:380 src/gpafileencryptop.c:727
-#: src/gpafilesignop.c:510 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
-#: src/gpakeypasswdop.c:197 src/gpakeysignop.c:229
+#: src/gpafiledecryptop.c:389 src/gpafileencryptop.c:751
+#: src/gpafilesignop.c:525 src/gpafileverifyop.c:475 src/gpakeyexpireop.c:240
+#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:237
 msgid "Wrong passphrase!"
 msgstr "Fel lösenfras!"
 
@@ -732,61 +477,60 @@
 msgid "Encrypting..."
 msgstr "Krypterar..."
 
-#: src/gpafileencryptop.c:453 src/verifydlg.c:222
+#: src/gpafileencryptop.c:457 src/verifydlg.c:222
 msgid "Unknown Key"
 msgstr "Okänd nyckel"
 
-#: src/gpafileencryptop.c:469
+#: src/gpafileencryptop.c:473
 #, fuzzy
 msgid "You are going to encrypt a document using the following key:"
 msgstr "Data kommer att krypteras med följande nyckel:"
 
-#: src/gpafileencryptop.c:475
+#: src/gpafileencryptop.c:479
 msgid "However, it is not certain that the key belongs to that person."
 msgstr "Det är dock inte säkert om nyckeln verkligen tillhör denna personen."
 
-#: src/gpafileencryptop.c:481
+#: src/gpafileencryptop.c:485
 msgid "Do you <b>really</b> want to use this key?"
 msgstr "Vill du <b>verkligen</b> använda denna nyckel?"
 
-#: src/gpafileencryptop.c:502 src/gpafileencryptop.c:542 src/verifydlg.c:227
+#: src/gpafileencryptop.c:506 src/gpafileencryptop.c:546 src/verifydlg.c:227
 msgid "Revoked Key"
 msgstr "Spärrad nyckel"
 
-#: src/gpafileencryptop.c:504 src/gpafileencryptop.c:544 src/gpawizard.c:281
-#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:422
-#: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
+#: src/gpafileencryptop.c:508 src/gpafileencryptop.c:548 src/gtktools.c:52
+#: src/gtktools.c:86 src/keyeditdlg.c:149 src/verifydlg.c:115
 msgid "_Close"
 msgstr "_Stäng"
 
-#: src/gpafileencryptop.c:517
+#: src/gpafileencryptop.c:521
 msgid "The following key has been revoked by it's owner:"
 msgstr "Följande nyckel har spärrats av sin ägare:"
 
-#: src/gpafileencryptop.c:522 src/gpafileencryptop.c:565
+#: src/gpafileencryptop.c:526 src/gpafileencryptop.c:569
 msgid "And can not be used for encryption."
 msgstr "och kan inte användas för kryptering."
 
-#: src/gpafileencryptop.c:557
+#: src/gpafileencryptop.c:561
 #, c-format
 msgid "The following key expired on %s:"
 msgstr "Följande nyckel gick ut den %s:"
 
-#: src/gpafileencryptop.c:641 src/gpafilesignop.c:414
+#: src/gpafileencryptop.c:600 src/gpafilesignop.c:448
+msgid ""
+"The selected certificates are not all of the same type. That is, you mixed "
+"OpenPGP and X.509 certificates. Please make sure to select only certificates "
+"of the same type."
+msgstr ""
+
+#: src/gpafileencryptop.c:675 src/gpafilesignop.c:434
 msgid "You didn't select any key for signing"
 msgstr "Du valde ingen nyckel för signering"
 
-#: src/gpafilesignop.c:148
+#: src/gpafilesignop.c:157
 msgid "Signing..."
 msgstr "Signerar..."
 
-#: src/gpafilesignop.c:428
-msgid ""
-"The selected certificates are not all of the same type. That is, you mixed "
-"OpenPGP and X.509 certificates. Please make sure to select only certificates "
-"of the same type."
-msgstr ""
-
 #: src/gpafileverifyop.c:101
 msgid "Verifying..."
 msgstr "Validerar..."
@@ -808,15 +552,15 @@
 msgid "Generating Key..."
 msgstr "Genererar nyckel..."
 
-#: src/gpaimportfileop.c:131
+#: src/gpaimportfileop.c:132
 msgid "Import public keys from file"
 msgstr "Importera publika nycklar från fil"
 
-#: src/gpaimportop.c:197
+#: src/gpaimportop.c:196
 msgid "No keys were found."
 msgstr "Inga nycklar hittades."
 
-#: src/gpaimportop.c:205
+#: src/gpaimportop.c:204
 #, c-format
 msgid ""
 "%i public keys read\n"
@@ -833,35 +577,35 @@
 "%i hemliga nycklar importerade\n"
 "%i hemliga nycklar oförändrade"
 
-#: src/gpakeyexpireop.c:239
+#: src/gpakeyexpireop.c:244
 msgid ""
 "Invalid time given.\n"
 "(you may not set the expiration time to the past.)"
 msgstr ""
 
-#: src/gpakeyselector.c:86 src/keylist.c:567 src/siglist.c:94
+#: src/gpakeyselector.c:86 src/keylist.c:555 src/siglist.c:94
 #: src/siglist.c:114 src/verifydlg.c:324
 msgid "Key ID"
 msgstr "Nyckelidentitet"
 
-#: src/gpakeyselector.c:95 src/keylist.c:618 src/siglist.c:100
+#: src/gpakeyselector.c:95 src/keylist.c:606 src/siglist.c:100
 #: src/siglist.c:143 src/verifydlg.c:336
 msgid "User Name"
 msgstr "Användarnamn"
 
-#: src/gpakeysignop.c:188
+#: src/gpakeysignop.c:191
 msgid "No private key for signing."
 msgstr "Ingen privat nyckel för signering."
 
-#: src/gpakeysignop.c:233
+#: src/gpakeysignop.c:241
 msgid "This key has expired! Unable to sign."
 msgstr "Den här nyckeln har gått ut! Kan inte signera."
 
-#: src/gpakeysignop.c:237
+#: src/gpakeysignop.c:245
 msgid "This key has already been signed with your own!"
 msgstr "Den här nyckeln har redan signerats med din egen nyckel!"
 
-#: src/gpakeysignop.c:242
+#: src/gpakeysignop.c:250
 msgid "You haven't selected a default key to sign with!"
 msgstr "Du har inte valt en standardnyckel att signera med!"
 
@@ -889,7 +633,7 @@
 msgid "unknown"
 msgstr "okänt"
 
-#: src/gparecvkeydlg.c:101
+#: src/gparecvkeydlg.c:106
 msgid "Which key do you want to import? (The key must be specified by key ID)."
 msgstr ""
 "Vilken nyckel vill du importera? (Nyckeln måste anges med dess "
@@ -915,7 +659,7 @@
 msgid "Size"
 msgstr "Storlek"
 
-#: src/gpasubkeylist.c:97 src/keyeditdlg.c:171 src/keylist.c:580
+#: src/gpasubkeylist.c:97 src/keyeditdlg.c:168 src/keylist.c:568
 msgid "Expiry Date"
 msgstr "Utgångsdatum"
 
@@ -935,16 +679,16 @@
 msgid "Can authenticate"
 msgstr "Kan authentisera"
 
-#: src/gpasubkeylist.c:137 src/gpgmetools.c:613 src/gpgmetools.c:821
-#: src/gpgmetools.c:940
+#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:833
+#: src/gpgmetools.c:952
 msgid "Revoked"
 msgstr "Spärrad"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:615 src/gpgmetools.c:936
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:948
 msgid "Expired"
 msgstr "Utgången"
 
-#: src/gpasubkeylist.c:145 src/gpgmetools.c:617
+#: src/gpasubkeylist.c:145 src/gpgmetools.c:626
 msgid "Disabled"
 msgstr "Inaktiverad"
 
@@ -952,41 +696,41 @@
 msgid "Unsigned"
 msgstr "Osignerad"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:927 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:939 src/verifydlg.c:212
 msgid "Valid"
 msgstr "Giltig"
 
-#: src/gpawidgets.c:72 src/gpgmetools.c:661 src/gpgmetools.c:668
-#: src/keyring.c:1176 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
+#: src/keyring.c:1248 src/keysigndlg.c:100
 msgid "User Name:"
 msgstr "Användarnamn:"
 
-#: src/gpawidgets.c:72 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/keysigndlg.c:100
 msgid "User Names:"
 msgstr "Användarnamn:"
 
-#: src/gpawidgets.c:78 src/gpgmetools.c:662 src/gpgmetools.c:669
-#: src/keyring.c:1178
+#: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
+#: src/keyring.c:1250
 msgid "Key ID:"
 msgstr "Nyckelidentitet:"
 
-#: src/gpawidgets.c:194
+#: src/gpawidgets.c:180
 msgid "Expiration"
 msgstr "Utgångstid"
 
-#: src/gpawidgets.c:201
+#: src/gpawidgets.c:187
 msgid "_indefinitely valid"
 msgstr "_obegränsad giltighet"
 
-#: src/gpawidgets.c:210
+#: src/gpawidgets.c:195
 msgid "expire _after"
 msgstr "utgången _efter"
 
-#: src/gpawidgets.c:229
+#: src/gpawidgets.c:215
 msgid "expire o_n:"
 msgstr "utgår _den:"
 
-#: src/gpawidgets.c:302 src/keygendlg.c:295
+#: src/gpawidgets.c:289 src/keygendlg.c:291
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -994,19 +738,7 @@
 "!ÖDESDIGERT FEL!\n"
 "Ogiltigt infogande av utgångsdatum."
 
-#: src/gpawizard.c:260
-msgid "_Back"
-msgstr "_Tillbaka"
-
-#: src/gpawizard.c:267
-msgid "_Forward"
-msgstr "_Framåt"
-
-#: src/gpawizard.c:274
-msgid "_Apply"
-msgstr "_Verkställ"
-
-#: src/gpgmetools.c:58
+#: src/gpgmetools.c:59
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -1023,7 +755,7 @@
 "\n"
 "Programmet kommer nu att avslutas."
 
-#: src/gpgmetools.c:72
+#: src/gpgmetools.c:73
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -1042,8 +774,17 @@
 "Det här är antagligen ett fel i GPA.\n"
 "GPA kommer nu att försöka komma över felet."
 
-#: src/gpgmetools.c:477
+#: src/gpgmetools.c:139
+#, c-format
 msgid ""
+"The file %s already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Filen %s finns redan.\n"
+"Vill du skriva över den?"
+
+#: src/gpgmetools.c:486
+msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
 "* a safe place.                                                        *\n"
@@ -1056,7 +797,7 @@
 "************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:482
+#: src/gpgmetools.c:491
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -1064,188 +805,177 @@
 "Nyckeln som säkerhetskopierats till denna fil är:\n"
 "\n"
 
-#: src/gpgmetools.c:543
+#: src/gpgmetools.c:552
 msgid "DSA and ElGamal (default)"
 msgstr "DSA och ElGamal (standard)"
 
-#: src/gpgmetools.c:544
+#: src/gpgmetools.c:553
 msgid "DSA (sign only)"
 msgstr "DSA (endast signering)"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:554
 msgid "RSA (sign only)"
 msgstr "RSA (endast signering)"
 
-#: src/gpgmetools.c:581 src/gpgmetools.c:604 src/gpgmetools.c:621
-#: src/gpgmetools.c:932 src/gpgmetools.c:965
+#: src/gpgmetools.c:590 src/gpgmetools.c:613 src/gpgmetools.c:630
+#: src/gpgmetools.c:944 src/gpgmetools.c:977
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/gpgmetools.c:584
+#: src/gpgmetools.c:593
 msgid "Never"
 msgstr "Aldrig"
 
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:596
 msgid "Marginal"
 msgstr "Marginell"
 
-#: src/gpgmetools.c:590
+#: src/gpgmetools.c:599
 msgid "Full"
 msgstr "Fullständig"
 
-#: src/gpgmetools.c:593
+#: src/gpgmetools.c:602
 msgid "Ultimate"
 msgstr "Förbehållslös"
 
-#: src/gpgmetools.c:619
+#: src/gpgmetools.c:628
 msgid "Incomplete"
 msgstr "Ofullständigt"
 
-#: src/gpgmetools.c:625
+#: src/gpgmetools.c:634
 msgid "Fully Valid"
 msgstr "Fullständigt giltig"
 
-#: src/gpgmetools.c:659
+#: src/gpgmetools.c:668
 msgid "Please enter the passphrase for the following key:"
 msgstr "Ange lösenfrasen för följande nyckel:"
 
-#: src/gpgmetools.c:667
+#: src/gpgmetools.c:676
 msgid "Wrong passphrase, please try again:"
 msgstr "Felaktig lösenfras, försök igen:"
 
-#: src/gpgmetools.c:692
+#: src/gpgmetools.c:701
 msgid "Enter Passphrase"
 msgstr "Ange lösenfras"
 
-#: src/gpgmetools.c:814
+#: src/gpgmetools.c:826
 msgid "[None]"
 msgstr "[Ingen]"
 
-#: src/gpgmetools.c:904 src/verifydlg.c:269
+#: src/gpgmetools.c:916 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[Okänd användaridentitet]"
 
-#: src/gpgmetools.c:930 src/verifydlg.c:217
+#: src/gpgmetools.c:942 src/verifydlg.c:217
 msgid "Bad"
 msgstr "Felaktigt"
 
-#: src/gpgmetools.c:953
+#: src/gpgmetools.c:965
 msgid "Generic"
 msgstr "Allmänt"
 
-#: src/gpgmetools.c:956
+#: src/gpgmetools.c:968
 msgid "Persona"
 msgstr "Personligen"
 
-#: src/gpgmetools.c:959
+#: src/gpgmetools.c:971
 msgid "Casual"
 msgstr "Flyktigt"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:974
 msgid "Positive"
 msgstr "Helt säkert"
 
-#: src/gpgmetools.c:980
+#: src/gpgmetools.c:992
 msgid "The key can be used for certification, signing and encryption."
 msgstr "Nyckeln kan användas för certifiering, signering och kryptering."
 
-#: src/gpgmetools.c:983
+#: src/gpgmetools.c:995
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "Nyckeln kan användas för certifiering och signering, men inte för kryptering."
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:1001
 msgid "The key can be used for certification and encryption."
 msgstr "Nyckeln kan användas för certifiering och kryptering."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:1004
 msgid "The key can be used only for certification."
 msgstr "Nyckeln kan endast användas för certifiering."
 
-#: src/gpgmetools.c:1000
+#: src/gpgmetools.c:1012
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
 msgstr ""
 "Nyckeln kan användas för signering och kryptering, men inte för certifiering."
 
-#: src/gpgmetools.c:1003
+#: src/gpgmetools.c:1015
 msgid "The key can be used only for signing."
 msgstr "Nyckeln kan endast användas för signering."
 
-#: src/gpgmetools.c:1008
+#: src/gpgmetools.c:1020
 msgid "The key can be used only for encryption."
 msgstr "Nyckeln kan endast användas för kryptering."
 
-#: src/gpgmetools.c:1011
+#: src/gpgmetools.c:1023
 msgid "This key is useless."
 msgstr "Den här nyckeln är oanvändbar."
 
-#: src/gtktools.c:320
+#: src/gtktools.c:48
 msgid "GPA Error"
 msgstr "GPA-fel"
 
-#: src/helpmenu.c:202
+#: src/helpmenu.c:83
 msgid "About GPA"
 msgstr "Om GPA"
 
-#: src/helpmenu.c:247
-msgid "Brought to you by:"
-msgstr "Skapat av:"
+#: src/helpmenu.c:89
+#, fuzzy
+msgid "GPA is the GNU Privacy Assistant."
+msgstr "Hur GNU Privacy Assistant fungerar"
 
-#: src/helpmenu.c:284
+#: src/icons.c:199
 #, fuzzy
-msgid "GPA is Free Software under the"
-msgstr "GPA är fri programvara utgiven under"
+msgid "_Verify"
+msgstr "Validera"
 
-#: src/helpmenu.c:288
-msgid "GNU General Public License."
-msgstr "GNU General Public License."
+#: src/icons.c:200
+#, fuzzy
+msgid "_Encrypt"
+msgstr "Kryptera"
 
-#: src/helpmenu.c:292
-msgid "For news see:"
-msgstr "För nyheter och information, se:"
+#: src/icons.c:201
+#, fuzzy
+msgid "_Decrypt"
+msgstr "Dekryptera"
 
-#: src/helpmenu.c:297
+#: src/icons.c:202
 #, fuzzy
-msgid "http://www.gpg4win.org"
-msgstr "http://www.gnupg.org"
+msgid "_Brief"
+msgstr "Kortfattat"
 
-#: src/helpmenu.c:299
-msgid "http://www.gnupg.org"
-msgstr "http://www.gnupg.org"
+#: src/icons.c:203
+#, fuzzy
+msgid "_Detailed"
+msgstr "Detaljerat"
 
-#: src/helpmenu.c:382
+#: src/icons.c:204
 #, fuzzy
-msgid "GNU General Public License"
-msgstr "GNU General Public License."
+msgid "_Keyring Editor"
+msgstr "Nyckelringshanterare"
 
-#: src/helpmenu.c:409
+#: src/icons.c:205
 #, fuzzy
-msgid "_GNU General Public License"
-msgstr "GNU General Public License."
+msgid "_Clipboard"
+msgstr "/Fönster/_Filhanterare"
 
-#: src/helpmenu.c:436
-msgid "Show Help Text\n"
-msgstr "Visa hjälptext\n"
+#: src/icons.c:206
+#, fuzzy
+msgid "_File Manager"
+msgstr "filhanterare"
 
-#: src/helpmenu.c:444
-msgid "/_Help"
-msgstr "/_Hjälp"
-
-#: src/helpmenu.c:446
-msgid "/Help/_Contents"
-msgstr "/Hjälp/_Innehåll"
-
-#: src/helpmenu.c:449
-msgid "/Help/_License"
-msgstr "/Hjälp/_Licens"
-
-#: src/helpmenu.c:450
-msgid "/Help/_About"
-msgstr "/Hjälp/_Om"
-
 #: src/keydeletedlg.c:41
 msgid "Removing Secret Key"
 msgstr "Tar bort hemlig nyckel"
@@ -1292,23 +1022,27 @@
 msgid "Are you sure you want to delete this key?"
 msgstr "Är du säker på att du vill ta bort denna nyckel?"
 
-#: src/keyeditdlg.c:149
+#: src/keyeditdlg.c:147
 msgid "Edit Key"
 msgstr "Redigera nyckel"
 
-#: src/keyeditdlg.c:165
+#: src/keyeditdlg.c:162
 msgid "Change _passphrase"
 msgstr "Ändra _lösenfras"
 
-#: src/keyeditdlg.c:185
+#: src/keyeditdlg.c:182
 msgid "Change _expiration"
 msgstr "Ändra _utgångsdatum"
 
-#: src/keygendlg.c:58
+#: src/keygendlg.c:67
+msgid "You must enter a key size."
+msgstr ""
+
+#: src/keygendlg.c:72
 msgid "You must enter a User ID."
 msgstr ""
 
-#: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
+#: src/keygendlg.c:77 src/passwddlg.c:45
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -1316,7 +1050,7 @@
 "I rutorna \"Lösenfras\" och \"Repetera lösenfras\"\n"
 "måste du ange exakt samma lösenfras."
 
-#: src/keygendlg.c:70 src/keygenwizard.c:314 src/passwddlg.c:52
+#: src/keygendlg.c:84 src/passwddlg.c:52
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1324,7 +1058,7 @@
 "Du angav ingen lösenfras. Du behöver en lösenfras\n"
 "för att skydda din privata nyckel."
 
-#: src/keygendlg.c:83 src/keygenwizard.c:328 src/passwddlg.c:65
+#: src/keygendlg.c:97 src/passwddlg.c:65
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1336,23 +1070,25 @@
 "\n"
 "Ange en ny lösenfras."
 
-#: src/keygendlg.c:88 src/keygenwizard.c:333 src/passwddlg.c:70
+#: src/keygendlg.c:102 src/passwddlg.c:70
 msgid "_Enter new passphrase"
 msgstr "Ange _ny lösenfras"
 
-#: src/keygendlg.c:89 src/keygenwizard.c:334 src/passwddlg.c:71
+#: src/keygendlg.c:104 src/passwddlg.c:71
 msgid "Take this one _anyway"
 msgstr "Använd denna lösenfras _ändå"
 
-#: src/keygendlg.c:144 src/keygenwizard.c:541
+#: src/keygendlg.c:150 src/keygenwizard.c:571 src/keygenwizard.c:584
+#: src/keygenwizard.c:594 src/keygenwizard.c:604 src/keygenwizard.c:616
+#: src/keygenwizard.c:633 src/keygenwizard.c:645
 msgid "Generate key"
 msgstr "Skapa nyckel"
 
-#: src/keygendlg.c:185
+#: src/keygendlg.c:177
 msgid "_Algorithm: "
 msgstr "_Algoritm:"
 
-#: src/keygendlg.c:197
+#: src/keygendlg.c:192
 msgid "_Key size (bits): "
 msgstr "_Nyckelstorlek (bitar): "
 
@@ -1368,27 +1104,27 @@
 msgid "2048"
 msgstr "2048"
 
-#: src/keygendlg.c:216
+#: src/keygendlg.c:206
 msgid "_User ID: "
 msgstr "_Användaridentitet: "
 
-#: src/keygendlg.c:226
+#: src/keygendlg.c:217
 msgid "_Email: "
 msgstr "_E-postadress: "
 
-#: src/keygendlg.c:236
+#: src/keygendlg.c:226
 msgid "_Comment: "
 msgstr "_Kommentar: "
 
-#: src/keygendlg.c:248
+#: src/keygendlg.c:235
 msgid "_Passphrase: "
 msgstr "_Lösenfras: "
 
-#: src/keygendlg.c:260
+#: src/keygendlg.c:246
 msgid "_Repeat passphrase: "
 msgstr "_Repetera lösenfras: "
 
-#: src/keygenwizard.c:152
+#: src/keygenwizard.c:172
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1400,19 +1136,16 @@
 "Ditt namn kommer att vara en del av den nya nyckeln för att göra det enklare "
 "för andra att identifiera nycklarna."
 
-#: src/keygenwizard.c:157
+#: src/keygenwizard.c:175
 msgid "Your Name:"
 msgstr "Ditt namn:"
 
-#: src/keygenwizard.c:170
-msgid "Please insert your name"
-msgstr "Ange ditt för- och efternamn."
-
-#: src/keygenwizard.c:183
+#: src/keygenwizard.c:211
+#, fuzzy
 msgid ""
 "Please insert your email address.\n"
 "\n"
-" Your email address will be part of the new key to make it easier for others "
+"Your email address will be part of the new key to make it easier for others "
 "to identify keys. If you have several email addresses, you can add further "
 "email adresses later."
 msgstr ""
@@ -1422,27 +1155,40 @@
 "enklare för andra att identifiera nycklarna. Om du har flera e-postadresser "
 "kan du lägga till dessa adresser senare."
 
-#: src/keygenwizard.c:190
+#: src/keygenwizard.c:215
 msgid "Your Email Address:"
 msgstr "Din e-postadress:"
 
-#: src/keygenwizard.c:205
-msgid "Please insert your email address"
-msgstr "Ange din e-postadress"
-
-#: src/keygenwizard.c:239
+#: src/keygenwizard.c:319
 msgid "Please choose a passphrase for the new key."
 msgstr "Välj en lösenfras för den nya nyckeln."
 
-#: src/keygenwizard.c:248 src/passwddlg.c:108
+#: src/keygenwizard.c:326
+#, fuzzy
+msgid ""
+"In \"Passphrase\" and \"Repeat passphrase\", you must enter the same "
+"passphrase."
+msgstr ""
+"I rutorna \"Lösenfras\" och \"Repetera lösenfras\"\n"
+"måste du ange exakt samma lösenfras."
+
+#: src/keygenwizard.c:335
+msgid "Warning: The passphrase you have entered is not very secure."
+msgstr ""
+
+#: src/keygenwizard.c:350
+msgid "Quality: "
+msgstr ""
+
+#: src/keygenwizard.c:358 src/passwddlg.c:111
 msgid "Passphrase: "
 msgstr "Lösenfras: "
 
-#: src/keygenwizard.c:261 src/passwddlg.c:117
+#: src/keygenwizard.c:370 src/passwddlg.c:120
 msgid "Repeat Passphrase: "
 msgstr "Repetera lösenfras: "
 
-#: src/keygenwizard.c:358
+#: src/keygenwizard.c:412
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1454,15 +1200,15 @@
 "\n"
 "Vill du skapa en säkerhetskopia?"
 
-#: src/keygenwizard.c:367
+#: src/keygenwizard.c:420
 msgid "Create _backup copy"
 msgstr "Skapa _säkerhetskopia"
 
-#: src/keygenwizard.c:374 src/keyring.c:739 src/keyring.c:767
+#: src/keygenwizard.c:425 src/keyring.c:737 src/keyring.c:763
 msgid "Do it _later"
 msgstr "_Vänta till senare"
 
-#: src/keygenwizard.c:402
+#: src/keygenwizard.c:454
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1472,7 +1218,7 @@
 "\n"
 "Detta kan ta tid även på kraftfulla datorer. Ha tålamod."
 
-#: src/keygenwizard.c:411
+#: src/keygenwizard.c:463
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1492,44 +1238,44 @@
 "GnuPG bygger om tillitsdatabasen.\n"
 "Det här kan ta några sekunder."
 
-#: src/keylist.c:559
+#: src/keylist.c:547
 msgid ""
 "This columns lists the type of the certificate.  A 'P' denotes OpenPGP and a "
 "'X' denotes X.509 (S/MIME)."
 msgstr ""
 
-#: src/keylist.c:568
+#: src/keylist.c:556
 #, fuzzy
 msgid "The key ID is a short number to identify a certificate."
 msgstr "Nyckeln kan endast användas för certifiering."
 
-#: src/keylist.c:581
+#: src/keylist.c:569
 msgid "The Expiry Date is the date until the certificate is valid."
 msgstr ""
 
-#: src/keylist.c:591 src/ownertrustdlg.c:122
+#: src/keylist.c:579 src/ownertrustdlg.c:123
 msgid "Owner Trust"
 msgstr "Ägartillit"
 
-#: src/keylist.c:592
+#: src/keylist.c:580
 msgid ""
 "The Owner Trust has been set by you and describes how far you trust the "
 "holder of the certificate to correctly sign (certify) other certificates.  "
 "It is only meaningful for OpenPGP."
 msgstr ""
 
-#: src/keylist.c:604
+#: src/keylist.c:592
 #, fuzzy
 msgid "Validity"
 msgstr "Giltighet"
 
-#: src/keylist.c:605
+#: src/keylist.c:593
 msgid ""
 "The Validity describes the trust level the system has in this certificate.  "
 "That is how sure it is that the named user is actually that user."
 msgstr ""
 
-#: src/keylist.c:619
+#: src/keylist.c:607
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
@@ -1539,7 +1285,7 @@
 msgid "No keys selected for signing."
 msgstr "Inga nycklar valda för signering."
 
-#: src/keyring.c:734
+#: src/keyring.c:732
 msgid ""
 "You do not have a private key yet. Do you want to generate one now "
 "(recommended) or do it later?"
@@ -1547,11 +1293,11 @@
 "Du har inte skapat en privat nyckel ännu. Vill du skapa en nu "
 "(rekommenderas) eller vänta till senare?"
 
-#: src/keyring.c:738
+#: src/keyring.c:736
 msgid "_Generate key now"
 msgstr "Generera nyckel _nu"
 
-#: src/keyring.c:761
+#: src/keyring.c:757
 msgid ""
 "You do not have a backup copy of your private key yet. Do you want to backup "
 "your key now (recommended) or do it later?"
@@ -1559,338 +1305,247 @@
 "Du har inte gjort en säkerhetskopia av din privata nyckel ännu. Vill du göra "
 "en nu (rekommenderas) eller vänta till senare?"
 
-#: src/keyring.c:766
+#: src/keyring.c:762
 msgid "_Backup key now"
 msgstr "Skapa _säkerhetskopia nu"
 
-#: src/keyring.c:883
-msgid "/_Keys"
+#: src/keyring.c:886
+#, fuzzy
+msgid "_Keys"
 msgstr "/_Nycklar"
 
-#: src/keyring.c:884
-msgid "/Keys/_Refresh"
-msgstr "/Nycklar/_Uppdatera"
-
-#: src/keyring.c:886
-msgid "/Keys/sep0"
-msgstr "/Nycklar/sep0"
-
 #: src/keyring.c:887
-msgid "/Keys/_New Key..."
-msgstr "/Nycklar/_Ny nyckel..."
+#, fuzzy
+msgid "_Server"
+msgstr "/_Server"
 
-#: src/keyring.c:889
-msgid "/Keys/_Delete Keys..."
-msgstr "/Nycklar/_Ta bort nycklar..."
+#: src/keyring.c:901
+msgid "Select all certificates"
+msgstr ""
 
-#: src/keyring.c:891
-msgid "/Keys/sep1"
-msgstr "/Nycklar/sep1"
+#: src/keyring.c:906
+msgid "Refresh the keyring"
+msgstr "Uppdatera nyckelringen"
 
-#: src/keyring.c:892
-msgid "/Keys/_Sign Keys..."
-msgstr "/Nycklar/_Signera nycklar..."
+#: src/keyring.c:907
+#, fuzzy
+msgid "_New key..."
+msgstr "/Nycklar/_Ny nyckel..."
 
-#: src/keyring.c:893
-msgid "/Keys/Set _Owner Trust..."
-msgstr "/Nycklar/Ställ in _ägartillit..."
+#: src/keyring.c:908
+#, fuzzy
+msgid "Generate a new key"
+msgstr "Skapa nyckel"
 
-#: src/keyring.c:894
-msgid "/Keys/_Edit Private Key..."
-msgstr "/Nycklar/Redigera _privat nyckel..."
+#: src/keyring.c:909
+#, fuzzy
+msgid "_Delete keys"
+msgstr "/_Ta bort nycklar..."
 
-#: src/keyring.c:895
-msgid "/Keys/sep2"
-msgstr "/Nycklar/sep2"
+#: src/keyring.c:910
+msgid "Remove the selected key"
+msgstr "Ta bort vald nyckel"
 
-#: src/keyring.c:896
-msgid "/Keys/_Import Keys..."
-msgstr "/Nycklar/_Importera nycklar..."
+#: src/keyring.c:911
+#, fuzzy
+msgid "_Sign Keys..."
+msgstr "/_Signera nycklar..."
 
-#: src/keyring.c:897
-msgid "/Keys/E_xport Keys..."
-msgstr "/Nycklar/E_xportera nycklar..."
+#: src/keyring.c:912
+msgid "Sign the selected key"
+msgstr "Signera vald nyckel"
 
-#: src/keyring.c:898
-msgid "/Keys/_Backup..."
-msgstr "/Nycklar/Säkerhets_kopiera..."
+#: src/keyring.c:913
+#, fuzzy
+msgid "Set _Owner Trust..."
+msgstr "/Ställ in _ägartillit..."
 
-#: src/keyring.c:901
-msgid "/_Server"
-msgstr "/_Server"
+#: src/keyring.c:914
+#, fuzzy
+msgid "Set owner trust of the selected key"
+msgstr "Ta bort vald nyckel"
 
-#: src/keyring.c:902
-msgid "/Server/_Retrieve Keys..."
-msgstr "/Server/_Hämta nycklar..."
+#: src/keyring.c:916
+#, fuzzy
+msgid "_Edit Private Key..."
+msgstr "/Redigera _privat nyckel..."
 
-#: src/keyring.c:903
-msgid "/Server/_Send Keys..."
-msgstr "/Server/_Skicka nycklar..."
+#: src/keyring.c:917
+msgid "Edit the selected private key"
+msgstr "Redigera markerad privat nyckel"
 
-#: src/keyring.c:908
+#: src/keyring.c:919
 #, fuzzy
-msgid "/Windows/_File Manager"
-msgstr "/Fönster/_Filhanterare"
+msgid "_Import Keys..."
+msgstr "Importera nycklar"
 
-#: src/keyring.c:939
-msgid "/Keys/Export Keys..."
-msgstr "/Nycklar/Exportera nycklar..."
+#: src/keyring.c:920
+msgid "Import Keys"
+msgstr "Importera nycklar"
 
-#: src/keyring.c:944
-msgid "/Keys/Delete Keys..."
-msgstr "/Nycklar/Ta bort nycklar..."
+#: src/keyring.c:921
+#, fuzzy
+msgid "E_xport Keys..."
+msgstr "/E_xportera nycklar..."
 
-#: src/keyring.c:952
-msgid "/Server/Send Keys..."
-msgstr "/Server/Skicka nycklar..."
+#: src/keyring.c:922
+msgid "Export Keys"
+msgstr "Exportera nycklar"
 
-#: src/keyring.c:959
-msgid "/Keys/Set Owner Trust..."
-msgstr "/Nycklar/Ställ in ägartillit..."
+#: src/keyring.c:923
+#, fuzzy
+msgid "_Backup..."
+msgstr "/Säkerhets_kopiera..."
 
-#: src/keyring.c:966
-msgid "/Keys/Sign Keys..."
-msgstr "/Nycklar/Signera nycklar..."
+#: src/keyring.c:924
+#, fuzzy
+msgid "Backup key"
+msgstr "Säkerhetskopiera nycklar"
 
-#: src/keyring.c:972
-msgid "/Keys/Edit Private Key..."
-msgstr "/Nycklar/Redigera privat nyckel..."
+#: src/keyring.c:927
+#, fuzzy
+msgid "_Retrieve Keys..."
+msgstr "/Server/_Hämta nycklar..."
 
-#: src/keyring.c:977
-msgid "/Keys/Backup..."
-msgstr "/Nycklar/Säkerhetskopiera..."
+#: src/keyring.c:928
+#, fuzzy
+msgid "Retrieve keys from server"
+msgstr "_Hämta öppen nyckel från nyckelserver:"
 
-#: src/keyring.c:994
-msgid "/_Copy"
-msgstr "/_Kopiera"
-
-#: src/keyring.c:996
-msgid "/_Paste"
-msgstr "/Klistra _in"
-
-#: src/keyring.c:998
-msgid "/_Delete Keys..."
-msgstr "/_Ta bort nycklar..."
-
-#: src/keyring.c:1001
-msgid "/_Sign Keys..."
+#: src/keyring.c:930
+#, fuzzy
+msgid "_Send Keys..."
 msgstr "/_Signera nycklar..."
 
-#: src/keyring.c:1002
-msgid "/Set _Owner Trust..."
-msgstr "/Ställ in _ägartillit..."
+#: src/keyring.c:931
+#, fuzzy
+msgid "Send keys to server"
+msgstr "/Skic_ka nycklar till server..."
 
-#: src/keyring.c:1003
-msgid "/_Edit Private Key..."
-msgstr "/Redigera _privat nyckel..."
+#: src/keyring.c:937
+msgid "Show Brief Keylist"
+msgstr "Visa kortfattad nyckellista"
 
-#: src/keyring.c:1005
-msgid "/E_xport Keys..."
-msgstr "/E_xportera nycklar..."
+#: src/keyring.c:939
+msgid "Show Key Details"
+msgstr "Visa nyckeldetaljer"
 
-#: src/keyring.c:1006
-msgid "/Se_nd Keys to Server..."
-msgstr "/Skic_ka nycklar till server..."
+#: src/keyring.c:1063
+msgid "Edit"
+msgstr "Redigera"
 
-#: src/keyring.c:1007
-msgid "/_Backup..."
-msgstr "/Säkerhets_kopiera..."
+#: src/keyring.c:1065
+#, fuzzy
+msgid "Delete"
+msgstr "/Redigera/Markera _allt"
 
-#: src/keyring.c:1018
-msgid "/Set Owner Trust..."
-msgstr "/Ställ in ägartillit..."
+#: src/keyring.c:1067
+msgid "Sign"
+msgstr "Signera"
 
-#: src/keyring.c:1025
-msgid "/Sign Keys..."
-msgstr "/Signera nycklar..."
+#: src/keyring.c:1069
+msgid "Export"
+msgstr "Exportera"
 
-#: src/keyring.c:1031
-msgid "/Edit Private Key..."
-msgstr "/Redigera privat nyckel..."
+#: src/keyring.c:1071
+msgid "Import"
+msgstr "Importera"
 
-#: src/keyring.c:1036
-msgid "/Backup..."
-msgstr "/Säkerhetskopiera..."
-
-#: src/keyring.c:1106
+#: src/keyring.c:1178
 msgid "Subkeys"
 msgstr "Undernycklar"
 
-#: src/keyring.c:1180 src/keysigndlg.c:110
+#: src/keyring.c:1252 src/keysigndlg.c:106
 msgid "Fingerprint:"
 msgstr "Fingeravtryck:"
 
-#: src/keyring.c:1182
+#: src/keyring.c:1254
 msgid "Expires at:"
 msgstr "Går ut den:"
 
-#: src/keyring.c:1184
+#: src/keyring.c:1256
 msgid "Owner Trust:"
 msgstr "Ägartillit:"
 
-#: src/keyring.c:1186
+#: src/keyring.c:1258
 msgid "Key Validity:"
 msgstr "Nyckelgiltighet:"
 
-#: src/keyring.c:1188
+#: src/keyring.c:1260
 msgid "Key Type:"
 msgstr "Nyckeltyp:"
 
-#: src/keyring.c:1190
+#: src/keyring.c:1262
 msgid "Created at:"
 msgstr "Skapad den:"
 
-#: src/keyring.c:1193
+#: src/keyring.c:1265
 msgid "Details"
 msgstr "Detaljer"
 
-#: src/keyring.c:1201
+#: src/keyring.c:1273
 msgid "Show signatures on user name:"
 msgstr "Visa signaturer på användarnamn:"
 
-#: src/keyring.c:1225
+#: src/keyring.c:1298
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: src/keyring.c:1249
+#: src/keyring.c:1322
 msgid "The key has both a private and a public part"
 msgstr "Denna nyckel har både en privat och en publik del"
 
-#: src/keyring.c:1252
+#: src/keyring.c:1325
 msgid "The key has only a public part"
 msgstr "Denna nyckel har endast en publik del"
 
-#: src/keyring.c:1287
+#: src/keyring.c:1360
 #, c-format
 msgid "%s %u bits"
 msgstr "%s %u bitar"
 
-#: src/keyring.c:1312
+#: src/keyring.c:1385
 msgid "No keys selected"
 msgstr "Inga nycklar valda"
 
-#: src/keyring.c:1315
+#: src/keyring.c:1388
 #, fuzzy, c-format
 msgid "%d key selected"
 msgid_plural "%d keys selected"
 msgstr[0] "%d nycklar valda"
 msgstr[1] "%d nycklar valda"
 
-#: src/keyring.c:1347
+#: src/keyring.c:1423
 msgid "All signatures"
 msgstr "Alla signaturer"
 
-#: src/keyring.c:1552
-msgid "Edit"
-msgstr "Redigera"
-
-#: src/keyring.c:1553
-msgid "Edit the selected private key"
-msgstr "Redigera markerad privat nyckel"
-
-#: src/keyring.c:1554
-msgid "edit key"
-msgstr "redigera nyckel"
-
-#: src/keyring.c:1562
-msgid "Remove the selected key"
-msgstr "Ta bort vald nyckel"
-
-#: src/keyring.c:1563
-msgid "remove key"
-msgstr "ta bort nyckel"
-
-#: src/keyring.c:1571
-msgid "Sign the selected key"
-msgstr "Signera vald nyckel"
-
-#: src/keyring.c:1571
-msgid "sign key"
-msgstr "signera nyckel"
-
 #: src/keyring.c:1578
-msgid "Import"
-msgstr "Importera"
-
-#: src/keyring.c:1579
-msgid "Import Keys"
-msgstr "Importera nycklar"
-
-#: src/keyring.c:1579
-msgid "import keys"
-msgstr "importera nycklar"
-
-#: src/keyring.c:1584
-msgid "Export"
-msgstr "Exportera"
-
-#: src/keyring.c:1585
-msgid "Export Keys"
-msgstr "Exportera nycklar"
-
-#: src/keyring.c:1585
-msgid "export keys"
-msgstr "exportera nycklar"
-
-#: src/keyring.c:1598
-msgid "Brief"
-msgstr "Kortfattat"
-
-#: src/keyring.c:1598
-msgid "Show Brief Keylist"
-msgstr "Visa kortfattad nyckellista"
-
-#: src/keyring.c:1599
-msgid "brief"
-msgstr "kortfattat"
-
-#: src/keyring.c:1610
-msgid "Detailed"
-msgstr "Detaljerat"
-
-#: src/keyring.c:1610
-msgid "Show Key Details"
-msgstr "Visa nyckeldetaljer"
-
-#: src/keyring.c:1611
-msgid "detailed"
-msgstr "detaljerat"
-
-#: src/keyring.c:1639
-msgid "Refresh the keyring"
-msgstr "Uppdatera nyckelringen"
-
-#: src/keyring.c:1640
-msgid "refresh keyring"
-msgstr "uppdatera nyckelring"
-
-#: src/keyring.c:1711
 #, fuzzy
 msgid "Selected default key:"
 msgstr "Vald standardnyckel:"
 
-#: src/keyring.c:1721
+#: src/keyring.c:1588
 #, fuzzy
 msgid "No default key selected in the preferences."
 msgstr "Inga nycklar markerades för export."
 
-#: src/keyring.c:1833
+#: src/keyring.c:1701
 msgid "GNU Privacy Assistant - Keyring Editor"
 msgstr "GNU Privacy Assistant - Nyckelringshanterare"
 
-#: src/keyring.c:1865
+#: src/keyring.c:1728
 msgid "Keyring Editor"
 msgstr "Nyckelringshanterare"
 
-#: src/keysigndlg.c:60
+#: src/keysigndlg.c:59
 msgid "Sign Key"
 msgstr "Signera nyckel"
 
-#: src/keysigndlg.c:76
+#: src/keysigndlg.c:72
 msgid "Do you want to sign the following key?"
 msgstr "Vill du signera följande nyckel?"
 
-#: src/keysigndlg.c:120
+#: src/keysigndlg.c:116
 msgid ""
 "Check the name and fingerprint carefully to be sure that it really is the "
 "key you want to sign."
@@ -1898,19 +1553,19 @@
 "Kontrollera namnet och fingeravtrycket noggrant. Är du säker på att detta är "
 "nyckeln du vill signera?"
 
-#: src/keysigndlg.c:128
+#: src/keysigndlg.c:124
 msgid "All user names in this key will be signed."
 msgstr "Alla användarnamn i denna nyckel kommer att signeras."
 
-#: src/keysigndlg.c:134
+#: src/keysigndlg.c:130
 msgid "The key will be signed with your default private key."
 msgstr "Nyckeln kommer att signeras med din privata standardnyckel."
 
-#: src/keysigndlg.c:141
+#: src/keysigndlg.c:137
 msgid "Sign only _locally"
 msgstr "Signera endast _lokalt"
 
-#: src/options.c:316
+#: src/options.c:323
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -1918,36 +1573,36 @@
 "Den privata nyckel du valt som standard finns inte längre tillgänglig.\n"
 "GPA kommer att försöka att välja en ny standardnyckel automatiskt."
 
-#: src/ownertrustdlg.c:106
+#: src/ownertrustdlg.c:107
 msgid "Change key ownertrust"
 msgstr "Ändra nyckelns ägartillit"
 
-#: src/ownertrustdlg.c:130
+#: src/ownertrustdlg.c:131
 msgid "_Unknown"
 msgstr "_Okänd"
 
-#: src/ownertrustdlg.c:135
+#: src/ownertrustdlg.c:136
 msgid ""
 "You don't know how much to trust this user to verify other people's keys.\n"
 msgstr ""
 "Du vet inte hur mycket du litar på denne persons omdöme vid validering\n"
 "av andras nycklar.\n"
 
-#: src/ownertrustdlg.c:145
+#: src/ownertrustdlg.c:146
 msgid "_Never"
 msgstr "_Aldrig"
 
-#: src/ownertrustdlg.c:150
+#: src/ownertrustdlg.c:151
 msgid ""
 "You don't trust this user at all to verify the validity of other people's "
 "keys at all.\n"
 msgstr "Du litar INTE på denne persons förtroende för andra nycklar.\n"
 
-#: src/ownertrustdlg.c:160
+#: src/ownertrustdlg.c:161
 msgid "_Marginal"
 msgstr "_Marginellt"
 
-#: src/ownertrustdlg.c:165
+#: src/ownertrustdlg.c:166
 msgid ""
 "You don't trust this user's ability to verify the validity of other people's "
 "keys enough to consider keys valid based on his/her sole word.\n"
@@ -1959,11 +1614,11 @@
 "är signerad av denna person och minst två andra marginellt tillitliga "
 "nycklar anses emellertid som tillförlitlig.\n"
 
-#: src/ownertrustdlg.c:182
+#: src/ownertrustdlg.c:183
 msgid "_Full"
 msgstr "_Fullständigt"
 
-#: src/ownertrustdlg.c:187
+#: src/ownertrustdlg.c:188
 msgid ""
 "You trust this user's ability to verify the validity of other people's keys "
 "so much, that you'll consider valid any key signed by him/her, provided this "
@@ -1972,11 +1627,11 @@
 "Du litar på denne persons förtroende för andra nycklar, och alla nycklar "
 "signerade med dennes (giltiga) nyckel anses som tillförlitlig.\n"
 
-#: src/ownertrustdlg.c:200
+#: src/ownertrustdlg.c:201
 msgid "U_ltimate"
 msgstr "_Förbehållslöst"
 
-#: src/ownertrustdlg.c:205
+#: src/ownertrustdlg.c:206
 msgid ""
 "You consider this key valid, and trust the user so much that you will "
 "consider any key signed by him/her fully valid.\n"
@@ -2066,37 +1721,148 @@
 "Det finns ingen insticksmodul för nyckelserverprotokollet\n"
 "du angav."
 
-#: src/server_access.c:528 src/server_access.c:574
+#: src/server_access.c:528 src/server_access.c:572
 msgid "The keyserver you specified is not valid"
 msgstr "Nyckelservern du angav är inte giltig"
 
-#: src/settingsdlg.c:59
+#: src/settingsdlg.c:133 src/siglist.c:135
+msgid "Local"
+msgstr "Lokal"
+
+#: src/settingsdlg.c:134
 #, fuzzy
+msgid "Local, Keyserver"
+msgstr "_Nyckelserver: "
+
+#: src/settingsdlg.c:135
+#, fuzzy
+msgid "Local, PKA"
+msgstr "Lokal"
+
+#: src/settingsdlg.c:136
+msgid "Local, PKA, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:137
+msgid "Local, Keyserver, PKA"
+msgstr ""
+
+#: src/settingsdlg.c:138
+#, fuzzy
+msgid "Local, kDNS"
+msgstr "Lokal"
+
+#: src/settingsdlg.c:139
+msgid "Local, kDNS, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:140
+msgid "PKA"
+msgstr ""
+
+#: src/settingsdlg.c:141
+msgid "kDNS"
+msgstr ""
+
+#: src/settingsdlg.c:142
+msgid "Custom"
+msgstr ""
+
+#: src/settingsdlg.c:208
+#, fuzzy
+msgid "<b>User interface</b>"
+msgstr "Använd _avancerat läge:"
+
+#: src/settingsdlg.c:215
+#, fuzzy
+msgid "Use _advanced mode"
+msgstr "Använd _avancerat läge:"
+
+#: src/settingsdlg.c:221
+msgid "Show advanced _options"
+msgstr ""
+
+#: src/settingsdlg.c:272
+msgid ""
+"No default key has been selected.  This may lead to problems when signing or "
+"encrypting.  For example you might later not be able to read a mail written "
+"by you and encrypted to someone else.\n"
+"\n"
+"Please consider creating your own key and select it then."
+msgstr ""
+
+#: src/settingsdlg.c:278
+msgid "Continue without a default key"
+msgstr ""
+
+#: src/settingsdlg.c:280
+#, fuzzy
+msgid "Let me select a default key"
+msgstr "Vald standardnyckel:"
+
+#: src/settingsdlg.c:305
+#, fuzzy
 msgid "<b>Default _key</b>"
 msgstr "Standardn_yckel:"
 
-#: src/settingsdlg.c:111
+#: src/settingsdlg.c:405
 #, fuzzy
 msgid "<b>Default key_server</b>"
 msgstr "Sta_ndardnyckelserver:"
 
-#: src/settingsdlg.c:158
+#: src/settingsdlg.c:602
 #, fuzzy
-msgid "<b>Use _advanced mode</b>"
-msgstr "Använd _avancerat läge:"
+msgid "<b>Auto key _locate</b>"
+msgstr "Sta_ndardnyckelserver:"
 
-#: src/settingsdlg.c:193
-msgid "Settings"
-msgstr "Inställningar"
+#: src/settingsdlg.c:612
+msgid ""
+"The list of methods to locate keys via an email address.\n"
+"All given methods are used in turn until a matching key is found.  The "
+"supported methods are:\n"
+" Local\n"
+"   - Use the local keyring.\n"
+" Keyserver\n"
+"   - Use the default keyserver.\n"
+" PKA\n"
+"   - Use the Public Key Association.\n"
+" kDNS\n"
+"   - Use kDNS with the nameserver below.\n"
+" Custom\n"
+"   - Configured in the backend dialog.\n"
+msgstr ""
 
+#: src/settingsdlg.c:627
+msgid "Method:"
+msgstr ""
+
+#: src/settingsdlg.c:644
+msgid "The IP address of the nameserver used for the kDNS method."
+msgstr ""
+
+#: src/settingsdlg.c:646
+#, fuzzy
+msgid "kDNS Server:"
+msgstr "/_Server"
+
+#: src/settingsdlg.c:740
+#, fuzzy
+msgid "The URL given for the keyserver is not valid."
+msgstr "Nyckelservern du angav är inte giltig"
+
+#: src/settingsdlg.c:749
+msgid "The data given for \"Auto key locate\" is not valid."
+msgstr ""
+
+#: src/settingsdlg.c:886
+#, fuzzy
+msgid "GNU Privacy Assistant - Settings"
+msgstr "GNU Privacy Assistant - Nyckelringshanterare"
+
 #: src/siglist.c:128
 msgid "Level"
 msgstr "Nivå"
 
-#: src/siglist.c:135
-msgid "Local"
-msgstr "Lokal"
-
 #: src/verifydlg.c:116
 #, fuzzy
 msgid "Verify documents"
@@ -2124,6 +1890,354 @@
 msgid "Signatures:"
 msgstr "Signaturer:"
 
+#~ msgid "/File/C_lear"
+#~ msgstr "/Arkiv/_Töm"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Arkiv/_Öppna"
+
+#, fuzzy
+#~ msgid "/File/Save _As"
+#~ msgstr "/Arkiv/Stä_ng"
+
+#~ msgid "/File/sep1"
+#~ msgstr "/Arkiv/sep1"
+
+#~ msgid "/File/_Sign"
+#~ msgstr "/Arkiv/_Signera"
+
+#~ msgid "/File/_Verify"
+#~ msgstr "/Arkiv/_Validera"
+
+#~ msgid "/File/_Encrypt"
+#~ msgstr "/Arkiv/_Kryptera"
+
+#~ msgid "/File/_Decrypt"
+#~ msgstr "/Arkiv/_Dekryptera"
+
+#~ msgid "/File/sep2"
+#~ msgstr "/Arkiv/sep2"
+
+#~ msgid "/File/_Close"
+#~ msgstr "/Arkiv/Stä_ng"
+
+#~ msgid "/File/_Quit"
+#~ msgstr "/Arkiv/A_vsluta"
+
+#, fuzzy
+#~ msgid "/Edit/_Undo"
+#~ msgstr "/Redigera/_Kopiera"
+
+#, fuzzy
+#~ msgid "/Edit/_Redo"
+#~ msgstr "/Redigera/_Kopiera"
+
+#, fuzzy
+#~ msgid "/Edit/sep0"
+#~ msgstr "/Redigera/sep2"
+
+#, fuzzy
+#~ msgid "/Edit/Cut"
+#~ msgstr "/Redigera/Kopiera"
+
+#~ msgid "/Edit/_Copy"
+#~ msgstr "/Redigera/_Kopiera"
+
+#~ msgid "/Edit/_Paste"
+#~ msgstr "/Redigera/Klistra _in"
+
+#, fuzzy
+#~ msgid "/Edit/_Delete"
+#~ msgstr "/Redigera/Klistra _in"
+
+#~ msgid "/Edit/sep1"
+#~ msgstr "/Redigera/sep1"
+
+#~ msgid "/Edit/Select _All"
+#~ msgstr "/Redigera/Markera _allt"
+
+#~ msgid "/Edit/sep2"
+#~ msgstr "/Redigera/sep2"
+
+#~ msgid "/Edit/Pr_eferences..."
+#~ msgstr "/Redigera/_Inställningar"
+
+#, fuzzy
+#~ msgid "/Edit/_Backend Preferences..."
+#~ msgstr "/Redigera/_Inställningar"
+
+#~ msgid "/_Windows"
+#~ msgstr "/_Fönster"
+
+#~ msgid "/Windows/_Keyring Editor"
+#~ msgstr "/Fönster/_Nyckelringshanterare"
+
+#~ msgid "/Windows/_Filemanager"
+#~ msgstr "/Fönster/_Filhanterare"
+
+#~ msgid "/Edit/Copy"
+#~ msgstr "/Redigera/Kopiera"
+
+#, fuzzy
+#~ msgid "/Edit/Paste"
+#~ msgstr "/Redigera/Klistra _in"
+
+#~ msgid "open file"
+#~ msgstr "öppna fil"
+
+#, fuzzy
+#~ msgid "save file as"
+#~ msgstr "stäng filer"
+
+#, fuzzy
+#~ msgid "cut the selection"
+#~ msgstr "Kryptera markerad fil"
+
+#, fuzzy
+#~ msgid "copy the selection"
+#~ msgstr "Kryptera markerad fil"
+
+#, fuzzy
+#~ msgid "Sign the selected text"
+#~ msgstr "Signera vald nyckel"
+
+#, fuzzy
+#~ msgid "verify text"
+#~ msgstr "validera fil"
+
+#, fuzzy
+#~ msgid "encrypt text"
+#~ msgstr "kryptera fil"
+
+#, fuzzy
+#~ msgid "decrypt text"
+#~ msgstr "dekryptera fil"
+
+#~ msgid "preferences"
+#~ msgstr "inställningar"
+
+#, fuzzy
+#~ msgid "Open the keyring editor"
+#~ msgstr "öppna nyckelringsredigeraren (standard)"
+
+#, fuzzy
+#~ msgid "keyring editor"
+#~ msgstr "Nyckelringshanterare"
+
+#, fuzzy
+#~ msgid "Open the file manager"
+#~ msgstr "Öppna filhanteraren"
+
+#~ msgid "file manager"
+#~ msgstr "filhanterare"
+
+#~ msgid "Help"
+#~ msgstr "Hjälp"
+
+#~ msgid "help"
+#~ msgstr "hjälp"
+
+#~ msgid "/File/Sign"
+#~ msgstr "/Arkiv/Signera"
+
+#~ msgid "/File/Verify"
+#~ msgstr "/Arkiv/Validera"
+
+#~ msgid "/File/Encrypt"
+#~ msgstr "/Arkiv/Kryptera"
+
+#~ msgid "/File/Decrypt"
+#~ msgstr "/Arkiv/Dekryptera"
+
+#~ msgid "close files"
+#~ msgstr "stäng filer"
+
+#~ msgid "sign file"
+#~ msgstr "signera fil"
+
+#~ msgid "verify file"
+#~ msgstr "validera fil"
+
+#~ msgid "encrypt file"
+#~ msgstr "kryptera fil"
+
+#~ msgid "decrypt file"
+#~ msgstr "dekryptera fil"
+
+#, fuzzy
+#~ msgid "Open the clipboard"
+#~ msgstr "Öppna filhanteraren"
+
+#~ msgid "_Backup to file:"
+#~ msgstr "_Säkerhetskopiera till fil:"
+
+#~ msgid "B_rowse..."
+#~ msgstr "_Bläddra..."
+
+#~ msgid "_Back"
+#~ msgstr "_Tillbaka"
+
+#~ msgid "_Forward"
+#~ msgstr "_Framåt"
+
+#~ msgid "_Apply"
+#~ msgstr "_Verkställ"
+
+#~ msgid "Brought to you by:"
+#~ msgstr "Skapat av:"
+
+#, fuzzy
+#~ msgid "GPA is Free Software under the"
+#~ msgstr "GPA är fri programvara utgiven under"
+
+#~ msgid "GNU General Public License."
+#~ msgstr "GNU General Public License."
+
+#~ msgid "For news see:"
+#~ msgstr "För nyheter och information, se:"
+
+#, fuzzy
+#~ msgid "http://www.gpg4win.org"
+#~ msgstr "http://www.gnupg.org"
+
+#~ msgid "http://www.gnupg.org"
+#~ msgstr "http://www.gnupg.org"
+
+#, fuzzy
+#~ msgid "GNU General Public License"
+#~ msgstr "GNU General Public License."
+
+#, fuzzy
+#~ msgid "_GNU General Public License"
+#~ msgstr "GNU General Public License."
+
+#~ msgid "Show Help Text\n"
+#~ msgstr "Visa hjälptext\n"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Hjälp"
+
+#~ msgid "/Help/_Contents"
+#~ msgstr "/Hjälp/_Innehåll"
+
+#~ msgid "/Help/_License"
+#~ msgstr "/Hjälp/_Licens"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/Hjälp/_Om"
+
+#~ msgid "Please insert your name"
+#~ msgstr "Ange ditt för- och efternamn."
+
+#~ msgid "Please insert your email address"
+#~ msgstr "Ange din e-postadress"
+
+#~ msgid "/Keys/_Refresh"
+#~ msgstr "/Nycklar/_Uppdatera"
+
+#~ msgid "/Keys/sep0"
+#~ msgstr "/Nycklar/sep0"
+
+#~ msgid "/Keys/_Delete Keys..."
+#~ msgstr "/Nycklar/_Ta bort nycklar..."
+
+#~ msgid "/Keys/sep1"
+#~ msgstr "/Nycklar/sep1"
+
+#~ msgid "/Keys/_Sign Keys..."
+#~ msgstr "/Nycklar/_Signera nycklar..."
+
+#~ msgid "/Keys/Set _Owner Trust..."
+#~ msgstr "/Nycklar/Ställ in _ägartillit..."
+
+#~ msgid "/Keys/_Edit Private Key..."
+#~ msgstr "/Nycklar/Redigera _privat nyckel..."
+
+#~ msgid "/Keys/sep2"
+#~ msgstr "/Nycklar/sep2"
+
+#~ msgid "/Keys/_Import Keys..."
+#~ msgstr "/Nycklar/_Importera nycklar..."
+
+#~ msgid "/Keys/E_xport Keys..."
+#~ msgstr "/Nycklar/E_xportera nycklar..."
+
+#~ msgid "/Keys/_Backup..."
+#~ msgstr "/Nycklar/Säkerhets_kopiera..."
+
+#~ msgid "/Server/_Send Keys..."
+#~ msgstr "/Server/_Skicka nycklar..."
+
+#, fuzzy
+#~ msgid "/Windows/_File Manager"
+#~ msgstr "/Fönster/_Filhanterare"
+
+#~ msgid "/Keys/Export Keys..."
+#~ msgstr "/Nycklar/Exportera nycklar..."
+
+#~ msgid "/Keys/Delete Keys..."
+#~ msgstr "/Nycklar/Ta bort nycklar..."
+
+#~ msgid "/Server/Send Keys..."
+#~ msgstr "/Server/Skicka nycklar..."
+
+#~ msgid "/Keys/Set Owner Trust..."
+#~ msgstr "/Nycklar/Ställ in ägartillit..."
+
+#~ msgid "/Keys/Sign Keys..."
+#~ msgstr "/Nycklar/Signera nycklar..."
+
+#~ msgid "/Keys/Edit Private Key..."
+#~ msgstr "/Nycklar/Redigera privat nyckel..."
+
+#~ msgid "/Keys/Backup..."
+#~ msgstr "/Nycklar/Säkerhetskopiera..."
+
+#~ msgid "/_Copy"
+#~ msgstr "/_Kopiera"
+
+#~ msgid "/_Paste"
+#~ msgstr "/Klistra _in"
+
+#~ msgid "/Set Owner Trust..."
+#~ msgstr "/Ställ in ägartillit..."
+
+#~ msgid "/Sign Keys..."
+#~ msgstr "/Signera nycklar..."
+
+#~ msgid "/Edit Private Key..."
+#~ msgstr "/Redigera privat nyckel..."
+
+#~ msgid "/Backup..."
+#~ msgstr "/Säkerhetskopiera..."
+
+#~ msgid "edit key"
+#~ msgstr "redigera nyckel"
+
+#~ msgid "remove key"
+#~ msgstr "ta bort nyckel"
+
+#~ msgid "sign key"
+#~ msgstr "signera nyckel"
+
+#~ msgid "import keys"
+#~ msgstr "importera nycklar"
+
+#~ msgid "export keys"
+#~ msgstr "exportera nycklar"
+
+#~ msgid "brief"
+#~ msgstr "kortfattat"
+
+#~ msgid "detailed"
+#~ msgstr "detaljerat"
+
+#~ msgid "refresh keyring"
+#~ msgstr "uppdatera nyckelring"
+
+#~ msgid "Settings"
+#~ msgstr "Inställningar"
+
 #~ msgid "Sign files"
 #~ msgstr "Signera filer"
 
@@ -2202,18 +2316,12 @@
 #~ msgid "E_xport to file:"
 #~ msgstr "E_xportera till fil: "
 
-#~ msgid "_Key server:"
-#~ msgstr "_Nyckelserver: "
-
 #~ msgid "Import Key"
 #~ msgstr "Importera nyckel"
 
 #~ msgid "I_mport from file:"
 #~ msgstr "_Importera från fil:"
 
-#~ msgid "Receive from _server:"
-#~ msgstr "_Hämta öppen nyckel från nyckelserver:"
-
 #~ msgid ""
 #~ "You have a secret key without the\n"
 #~ "corresponding public key in your\n"

Modified: trunk/po/tr.po
===================================================================
--- trunk/po/tr.po	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/tr.po	2008-05-08 12:53:41 UTC (rev 891)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gpa 0.7.0\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-03-12 12:29+0100\n"
+"POT-Creation-Date: 2008-05-08 14:51+0200\n"
 "PO-Revision-Date: 2004-06-20 14:42+0300\n"
 "Last-Translator: Mert Çetin <mertc at su.sabanciuniv.edu>\n"
 "Language-Team: xTc & Déjà Vu\n"
@@ -15,425 +15,212 @@
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/clipboard.c:367 src/fileman.c:350
+#: src/clipboard.c:376 src/fileman.c:392
 msgid "Open File"
 msgstr "Dosyayý Aç"
 
-#: src/clipboard.c:395 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "GPA Mesajý"
 
 #. TRANSLATORS: The arguments are the filename, the integer size
 #. and the unit (such as KB or MB).
-#: src/clipboard.c:412
+#: src/clipboard.c:421
 #, fuzzy, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
 msgstr ""
 "%s dosyasý zaten var. \n"
 "Üzerine yazmak istiyor musunuz?"
 
-#: src/clipboard.c:481
+#: src/clipboard.c:542
 msgid "Save As..."
 msgstr ""
 
-#: src/clipboard.c:522 src/clipboard.c:552 src/clipboard.c:582
-#: src/clipboard.c:612 src/clipboard.c:1113 src/fileman.c:675
-#: src/keyring.c:1657
+#: src/clipboard.c:583 src/clipboard.c:613 src/clipboard.c:643
+#: src/clipboard.c:673 src/clipboard.c:1034
 msgid "Clipboard"
 msgstr ""
 
-#: src/clipboard.c:692 src/fileman.c:472 src/keyring.c:863
-msgid "/_File"
+#: src/clipboard.c:755 src/fileman.c:515 src/keyring.c:884
+#, fuzzy
+msgid "_File"
 msgstr "/_Dosya"
 
-#: src/clipboard.c:693 src/fileman.c:474
-msgid "/File/C_lear"
-msgstr "/Dosya/_Temizle"
-
-#: src/clipboard.c:694 src/fileman.c:473
-msgid "/File/_Open"
-msgstr "/Dosya/_Aç"
-
-#: src/clipboard.c:695
+#: src/clipboard.c:756 src/fileman.c:516 src/keyring.c:885
 #, fuzzy
-msgid "/File/Save _As"
-msgstr "/Dosya/_Kapat"
-
-#: src/clipboard.c:697 src/fileman.c:475
-msgid "/File/sep1"
-msgstr "/Dosya/bol1"
-
-#: src/clipboard.c:698 src/fileman.c:476
-msgid "/File/_Sign"
-msgstr "/Dosya/_Ýmzala"
-
-#: src/clipboard.c:699 src/fileman.c:477
-msgid "/File/_Verify"
-msgstr "/Dosya/_Doðrula"
-
-#: src/clipboard.c:700 src/fileman.c:478
-msgid "/File/_Encrypt"
-msgstr "/Dosya/_Þifrele"
-
-#: src/clipboard.c:701 src/fileman.c:479
-msgid "/File/_Decrypt"
-msgstr "/Dosya/Çö_z"
-
-#: src/clipboard.c:702 src/fileman.c:480
-msgid "/File/sep2"
-msgstr "/Dosya/bol2"
-
-#: src/clipboard.c:703 src/fileman.c:481 src/keyring.c:864
-msgid "/File/_Close"
-msgstr "/Dosya/_Kapat"
-
-#: src/clipboard.c:704 src/fileman.c:482 src/keyring.c:866
-msgid "/File/_Quit"
-msgstr "/Dosya/_Çýkýþ"
-
-#: src/clipboard.c:707 src/fileman.c:485 src/keyring.c:869
-msgid "/_Edit"
+msgid "_Edit"
 msgstr "/Dü_zen"
 
-#: src/clipboard.c:710
-#, fuzzy
-msgid "/Edit/_Undo"
-msgstr "/Düzen/_Kopyala"
-
-#: src/clipboard.c:711
-#, fuzzy
-msgid "/Edit/_Redo"
-msgstr "/Düzen/_Kopyala"
-
-#: src/clipboard.c:712
-#, fuzzy
-msgid "/Edit/sep0"
-msgstr "/Düzen/bol2"
-
-#: src/clipboard.c:714 src/clipboard.c:750
-#, fuzzy
-msgid "/Edit/Cut"
-msgstr "/Düzen/Kopyala"
-
-#: src/clipboard.c:715 src/keyring.c:870
-msgid "/Edit/_Copy"
-msgstr "/Düzen/_Kopyala"
-
-#: src/clipboard.c:716 src/keyring.c:872
-msgid "/Edit/_Paste"
-msgstr "/Düzen/_Yapýþtýr"
-
-#: src/clipboard.c:717
-#, fuzzy
-msgid "/Edit/_Delete"
-msgstr "/Düzen/_Yapýþtýr"
-
-#: src/clipboard.c:718 src/keyring.c:874
-msgid "/Edit/sep1"
-msgstr "/Düzen/bol1"
-
-#: src/clipboard.c:719 src/fileman.c:486 src/keyring.c:875
-msgid "/Edit/Select _All"
-msgstr "/Düzen/_Tümünü Seç"
-
-#: src/clipboard.c:721 src/fileman.c:487 src/keyring.c:876
-msgid "/Edit/sep2"
-msgstr "/Düzen/bol2"
-
-#: src/clipboard.c:722 src/fileman.c:488 src/keyring.c:877
-msgid "/Edit/Pr_eferences..."
-msgstr "/Düzen/Te_rcihler..."
-
-#: src/clipboard.c:724 src/fileman.c:490 src/keyring.c:879
-#, fuzzy
-msgid "/Edit/_Backend Preferences..."
-msgstr "/Düzen/Te_rcihler..."
-
-#: src/clipboard.c:728 src/fileman.c:494 src/keyring.c:906
-msgid "/_Windows"
-msgstr "/_Pencereler"
-
-#: src/clipboard.c:729 src/fileman.c:495 src/keyring.c:907
-msgid "/Windows/_Keyring Editor"
-msgstr "/Pencereler/_Anahtarlýk Düzenleyicisi"
-
-#: src/clipboard.c:730 src/fileman.c:496
-msgid "/Windows/_Filemanager"
-msgstr "/Pencereler/_Dosya Yöneticisi"
-
-#: src/clipboard.c:731 src/fileman.c:497 src/keyring.c:909
-#, fuzzy
-msgid "/Windows/_Clipboard"
-msgstr "/Pencereler/_Dosya Yöneticisi"
-
-#: src/clipboard.c:758 src/keyring.c:948
-msgid "/Edit/Copy"
-msgstr "/Düzen/Kopyala"
-
-#: src/clipboard.c:766
-#, fuzzy
-msgid "/Edit/Delete"
-msgstr "/Düzen/_Tümünü Seç"
-
-#: src/clipboard.c:774
-#, fuzzy
-msgid "/Edit/Paste"
-msgstr "/Düzen/_Yapýþtýr"
-
-#: src/clipboard.c:879
+#: src/clipboard.c:760
 msgid "Clear buffer"
 msgstr ""
 
-#: src/clipboard.c:879
-msgid "clear buffer"
-msgstr ""
-
-#: src/clipboard.c:887 src/fileman.c:602
+#: src/clipboard.c:762 src/fileman.c:520
 msgid "Open a file"
 msgstr "Bir dosya aç"
 
-#: src/clipboard.c:887 src/fileman.c:602
-msgid "open file"
-msgstr "dosyayý aç"
-
-#: src/clipboard.c:892
+#: src/clipboard.c:764
 #, fuzzy
 msgid "Save to a file"
 msgstr "Bir dosya aç"
 
-#: src/clipboard.c:892
+#: src/clipboard.c:766
 #, fuzzy
-msgid "save file as"
-msgstr "dosyalarý kapat"
+msgid "Sign buffer text"
+msgstr "anahtarý imzala"
 
-#: src/clipboard.c:900
+#: src/clipboard.c:768
 #, fuzzy
-msgid "Cut the selection"
-msgstr "Seçili dosyayý þifrele"
+msgid "Check signatures of buffer text"
+msgstr "Seçili dosyanýn imzalarýný kontrol edin"
 
-#: src/clipboard.c:901
+#: src/clipboard.c:770
 #, fuzzy
-msgid "cut the selection"
+msgid "Encrypt the buffer text"
 msgstr "Seçili dosyayý þifrele"
 
-#: src/clipboard.c:907
+#: src/clipboard.c:772
 #, fuzzy
-msgid "Copy the selection"
-msgstr "Seçili dosyayý þifrele"
+msgid "Decrypt the buffer text"
+msgstr "Seçili dosyayý çöz"
 
-#: src/clipboard.c:908
-#, fuzzy
-msgid "copy the selection"
-msgstr "Seçili dosyayý þifrele"
-
-#: src/clipboard.c:914
-msgid "Paste the clipboard"
+#: src/clipboard.c:774
+msgid "Close the buffer"
 msgstr ""
 
-#: src/clipboard.c:915
-msgid "paste the clipboard"
+#: src/clipboard.c:776 src/fileman.c:534 src/keyring.c:893
+msgid "Quit the program"
 msgstr ""
 
-#: src/clipboard.c:925 src/fileman.c:612 src/keyring.c:1570
-msgid "Sign"
-msgstr "Ýmzala"
-
-#: src/clipboard.c:926
+#: src/clipboard.c:782
 #, fuzzy
-msgid "Sign the selected text"
-msgstr "Seçili anahtarý imzala"
+msgid "Undo the last action"
+msgstr "Seçili dosyayý þifrele"
 
-#: src/clipboard.c:927
-#, fuzzy
-msgid "sign text"
-msgstr "anahtarý imzala"
+#: src/clipboard.c:784
+msgid "Redo the last undone action"
+msgstr ""
 
-#: src/clipboard.c:935 src/fileman.c:623
-msgid "Verify"
-msgstr "Doðrula"
-
-#: src/clipboard.c:936
+#: src/clipboard.c:787
 #, fuzzy
-msgid "Check signatures of selected text"
-msgstr "Seçili dosyanýn imzalarýný kontrol edin"
+msgid "Cut the selection"
+msgstr "Seçili dosyayý þifrele"
 
-#: src/clipboard.c:937
+#: src/clipboard.c:789 src/keyring.c:897
 #, fuzzy
-msgid "verify text"
-msgstr "dosyayý doðrula"
-
-#: src/clipboard.c:945 src/fileman.c:634
-msgid "Encrypt"
-msgstr "Þifrele"
-
-#: src/clipboard.c:946
-#, fuzzy
-msgid "Encrypt the selected text"
+msgid "Copy the selection"
 msgstr "Seçili dosyayý þifrele"
 
-#: src/clipboard.c:947
-#, fuzzy
-msgid "encrypt text"
-msgstr "dosyayý þifrele"
+#: src/clipboard.c:791 src/keyring.c:899
+msgid "Paste the clipboard"
+msgstr ""
 
-#: src/clipboard.c:955 src/fileman.c:645
-msgid "Decrypt"
-msgstr "Çöz"
-
-#: src/clipboard.c:956
+#: src/clipboard.c:793
 #, fuzzy
-msgid "Decrypt the selected text"
+msgid "Delete the selected text"
 msgstr "Seçili dosyayý çöz"
 
-#: src/clipboard.c:957
-#, fuzzy
-msgid "decrypt text"
-msgstr "dosyayý çöz"
+#: src/clipboard.c:795
+msgid "Select the entire document"
+msgstr ""
 
-#: src/clipboard.c:967 src/fileman.c:658 src/keyring.c:1631
+#: src/clipboard.c:902 src/fileman.c:625
 #, fuzzy
-msgid "Open the preferences dialog"
-msgstr "Tercihler penceresini aç"
-
-#: src/clipboard.c:968 src/fileman.c:659 src/keyring.c:1632
-msgid "preferences"
-msgstr "tercihler"
-
-#: src/clipboard.c:975 src/fileman.c:666
-#, fuzzy
 msgid "Keyring"
 msgstr "Anahtarlýk Düzenleyicisi"
 
-#: src/clipboard.c:976 src/fileman.c:667
-#, fuzzy
-msgid "Open the keyring editor"
-msgstr "anahtarlýk düzenleyicisini aç (varsayýlan)"
-
-#: src/clipboard.c:977 src/fileman.c:668
-#, fuzzy
-msgid "keyring editor"
-msgstr "Anahtarlýk Düzenleyicisi"
-
-#: src/clipboard.c:983 src/keyring.c:1648
+#: src/clipboard.c:904 src/keyring.c:1073
 msgid "Files"
 msgstr "Dosyalar"
 
-#: src/clipboard.c:984 src/keyring.c:1649
+#: src/clipboard.c:1004
 #, fuzzy
-msgid "Open the file manager"
-msgstr "Dosya Yöneticisini Aç"
-
-#: src/clipboard.c:985 src/keyring.c:1650
-msgid "file manager"
-msgstr "dosya yöneticisi"
-
-#: src/clipboard.c:992 src/fileman.c:684 src/keyring.c:1665
-msgid "Help"
-msgstr "Yardým"
-
-#: src/clipboard.c:993 src/fileman.c:685 src/keyring.c:1666
-msgid "Understanding the GNU Privacy Assistant"
-msgstr "GNU Gizlilik Asistanýný Anlamak"
-
-#: src/clipboard.c:994 src/fileman.c:686 src/keyring.c:1667
-msgid "help"
-msgstr "yardým"
-
-#: src/clipboard.c:1084
-#, fuzzy
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Gizlilik Asistaný - Dosya Yöneticisi"
 
-#: src/confdialog.c:993
+#: src/confdialog.c:994
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default values"
 msgstr ""
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default value"
 msgstr ""
 
-#: src/confdialog.c:1146
+#: src/confdialog.c:1147
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1155
+#: src/confdialog.c:1156
 msgid "Use default argument"
 msgstr ""
 
-#: src/confdialog.c:1280
+#: src/confdialog.c:1281
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1325
+#: src/confdialog.c:1326
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1334
+#: src/confdialog.c:1332
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1346
+#: src/confdialog.c:1351
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1350
+#: src/confdialog.c:1355
 #, fuzzy
 msgid "Level:"
 msgstr "Seviye"
 
-#: src/confdialog.c:1359
+#: src/confdialog.c:1364
 #, fuzzy
 msgid "Basic"
 msgstr "/_Yedekle..."
 
-#: src/confdialog.c:1360
+#: src/confdialog.c:1365
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1361
+#: src/confdialog.c:1366
 #, fuzzy
 msgid "Expert"
 msgstr "Dýþarý Yaz"
 
-#: src/encryptdlg.c:142 src/expirydlg.c:116 src/filesigndlg.c:133
-#: src/gpabackupop.c:292 src/gpaprogressdlg.c:146 src/gparecvkeydlg.c:96
-#: src/gpawizard.c:289 src/gpgmetools.c:696 src/keygendlg.c:149
-#: src/ownertrustdlg.c:111 src/passwddlg.c:100
-msgid "_Cancel"
-msgstr ""
-
-#: src/encryptdlg.c:143
+#: src/encryptdlg.c:139
 #, fuzzy
 msgid "Encrypt documents"
 msgstr "Dosyalarý Þifrele"
 
-#: src/encryptdlg.c:174
+#: src/encryptdlg.c:156
 msgid "_Public Keys"
 msgstr "Genel Anahtarlar"
 
-#: src/encryptdlg.c:177
+#: src/encryptdlg.c:179 src/icons.c:198
 msgid "_Sign"
 msgstr "_Ýmzala"
 
-#: src/encryptdlg.c:201 src/filesigndlg.c:185
+#: src/encryptdlg.c:185
 msgid "Sign _as "
 msgstr "_Farklý Ýmzala"
 
-#: src/encryptdlg.c:215 src/filesigndlg.c:187
+#: src/encryptdlg.c:215 src/filesigndlg.c:227
 msgid "A_rmor"
 msgstr "_Kalkan"
 
@@ -441,147 +228,100 @@
 msgid "Please provide a correct date."
 msgstr "Lütfen doðru bir tarih girin"
 
-#: src/expirydlg.c:111
+#: src/expirydlg.c:108
 msgid "Change expiry date"
 msgstr "Bitim süresini deðiþtir"
 
-#: src/expirydlg.c:129
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+msgid "_Cancel"
+msgstr ""
+
+#: src/expirydlg.c:124
 msgid "_never expire"
 msgstr "_asla bitme"
 
-#: src/expirydlg.c:134
+#: src/expirydlg.c:129
 msgid "_expire on:"
 msgstr "_bitim açýk"
 
-#: src/fileman.c:355 src/fileman.c:953
-msgid "The file is already open."
-msgstr "Bu dosya zaten açýk"
-
-#: src/fileman.c:516
-msgid "/File/Sign"
-msgstr "/Dosya/Ýmzala"
-
-#: src/fileman.c:521
-msgid "/File/Verify"
-msgstr "/Dosya/Doðrula"
-
-#: src/fileman.c:526
-msgid "/File/Encrypt"
-msgstr "/Dosya/Þifrele"
-
-#: src/fileman.c:531
-msgid "/File/Decrypt"
-msgstr "/Dosya/Çöz"
-
-#: src/fileman.c:606
+#: src/fileman.c:522
 msgid "Close all files"
 msgstr "Bütün dosyalarý kapat"
 
-#: src/fileman.c:606
-msgid "close files"
-msgstr "dosyalarý kapat"
-
-#: src/fileman.c:613
+#: src/fileman.c:524
 msgid "Sign the selected file"
 msgstr "Seçili dosyayý imzala"
 
-#: src/fileman.c:614
-msgid "sign file"
-msgstr "dosyayý imzala"
-
-#: src/fileman.c:624
+#: src/fileman.c:526
 msgid "Check signatures of selected file"
 msgstr "Seçili dosyanýn imzalarýný kontrol edin"
 
-#: src/fileman.c:625
-msgid "verify file"
-msgstr "dosyayý doðrula"
-
-#: src/fileman.c:635
+#: src/fileman.c:528
 msgid "Encrypt the selected file"
 msgstr "Seçili dosyayý þifrele"
 
-#: src/fileman.c:636
-msgid "encrypt file"
-msgstr "dosyayý þifrele"
-
-#: src/fileman.c:646
+#: src/fileman.c:530
 msgid "Decrypt the selected file"
 msgstr "Seçili dosyayý çöz"
 
-#: src/fileman.c:647
-msgid "decrypt file"
-msgstr "dosyayý çöz"
+#: src/fileman.c:532
+msgid "Close the window"
+msgstr ""
 
-#: src/fileman.c:676 src/keyring.c:1658
+#: src/fileman.c:538
 #, fuzzy
-msgid "Open the clipboard"
-msgstr "Dosya Yöneticisini Aç"
+msgid "Select all files"
+msgstr "Bütün dosyalarý kapat"
 
-#: src/fileman.c:677 src/keyring.c:1659
-msgid "clipboard"
-msgstr ""
-
-#: src/fileman.c:785
+#: src/fileman.c:731
 msgid "File"
 msgstr "Dosya"
 
-#: src/fileman.c:850
+#: src/fileman.c:796
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Gizlilik Asistaný - Dosya Yöneticisi"
 
-#: src/fileman.c:876
+#: src/fileman.c:819
 #, fuzzy
 msgid "File Manager"
 msgstr "dosya yöneticisi"
 
-#: src/filesigndlg.c:134
+#: src/fileman.c:895
+msgid "The file is already open."
+msgstr "Bu dosya zaten açýk"
+
+#: src/filesigndlg.c:171
 msgid "Sign documents"
 msgstr ""
 
-#: src/filesigndlg.c:144
-msgid "Signing Mode"
+#: src/filesigndlg.c:180
+#, fuzzy
+msgid "<b>Sign _as</b>"
+msgstr "_Farklý Ýmzala"
+
+#: src/filesigndlg.c:201
+#, fuzzy
+msgid "<b>Signing Mode</b>"
 msgstr "Ýmzalama Biçimi"
 
-#: src/filesigndlg.c:152
-msgid "si_gn and compress"
+#: src/filesigndlg.c:211
+#, fuzzy
+msgid "Si_gn and compress"
 msgstr "im_zala ve sýkýþtýr"
 
-#: src/filesigndlg.c:158
-msgid "_cleartext signature"
+#: src/filesigndlg.c:217
+#, fuzzy
+msgid "Clear_text signature"
 msgstr "_temiz yazý imzasý"
 
-#: src/filesigndlg.c:165
+#: src/filesigndlg.c:223
 #, fuzzy
-msgid "_detached signature"
+msgid "_Detached signature"
 msgstr "_temiz yazý imzasý"
 
-#: src/gpabackupop.c:213 src/gpgmetools.c:138
+#: src/gpabackupop.c:208
 #, c-format
 msgid ""
-"The file %s already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s dosyasý zaten var. \n"
-"Üzerine yazmak istiyor musunuz?"
-
-#: src/gpabackupop.c:216 src/gpaexportserverop.c:134
-#: src/gpafileencryptop.c:455 src/gpafileverifyop.c:178 src/gpgmetools.c:141
-#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:62
-#: src/settingsdlg.c:165
-msgid "_Yes"
-msgstr "_Evet"
-
-#: src/gpabackupop.c:217 src/gpaexportserverop.c:135
-#: src/gpafileencryptop.c:456 src/gpafileverifyop.c:179 src/gpgmetools.c:142
-#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:64
-#: src/settingsdlg.c:168
-msgid "_No"
-msgstr "_Hayýr"
-
-#: src/gpabackupop.c:229
-#, c-format
-msgid ""
 "A copy of your secret key has been made to the file:\n"
 "\n"
 "\t\"%s\"\n"
@@ -596,31 +336,19 @@
 "Bu önemli bir bilgidir, ve dikkatlica saklanmasý gerekmektedir\n"
 "(örneðin, güvenli bir yerde saklayacaðýnýz bir diskette)."
 
-#: src/gpabackupop.c:244
+#: src/gpabackupop.c:223
 msgid "An error ocurred during the backup operation."
 msgstr ""
 
-#: src/gpabackupop.c:260
+#: src/gpabackupop.c:245
 msgid "Backup key to file"
 msgstr "Anahtarý dosyaya yedekle"
 
-#: src/gpabackupop.c:287
-msgid "Backup Keys"
-msgstr "Anahtarlarý Yedekle"
-
-#: src/gpabackupop.c:311
+#: src/gpabackupop.c:255
 #, c-format
 msgid "Generating backup of key: %s"
 msgstr "%s anahtarýnýn yedeklemesi yapýlýyor"
 
-#: src/gpabackupop.c:317
-msgid "_Backup to file:"
-msgstr "Dosyaya _Yedekle"
-
-#: src/gpabackupop.c:329
-msgid "B_rowse..."
-msgstr "_Göz At"
-
 #: src/gpa.c:92
 #, fuzzy
 msgid "Output version information and exit"
@@ -641,26 +369,31 @@
 msgstr ""
 
 #: src/gpa.c:100
-msgid "Start only the UI server (implies --cms)"
+#, fuzzy
+msgid "Open the settings dialog"
+msgstr "Tercihler penceresini aç"
+
+#: src/gpa.c:102
+msgid "Enable the UI server (implies --cms)"
 msgstr ""
 
-#: src/gpa.c:102
+#: src/gpa.c:104
 #, fuzzy
 msgid "Read options from file"
 msgstr "seçenekleri dosyadan oku"
 
-#: src/gpa.c:293
+#: src/gpa.c:286
 msgid "[FILE...]"
 msgstr ""
 
-#: src/gpa.c:295
+#: src/gpa.c:288
 #, fuzzy
 msgid "Graphical frontend to GnuPG"
 msgstr ""
 "Sentaks: gpa [seçenekler]\n"
 "GnuPG'ye grafiksel uçbirim\n"
 
-#: src/gpa.c:296
+#: src/gpa.c:289
 msgid "Please report bugs to <"
 msgstr "Lütfen hatalarý <"
 
@@ -668,15 +401,15 @@
 msgid "The keys have been copied to the clipboard."
 msgstr "Anahtarlar panoya kopyalandý"
 
-#: src/gpaexportfileop.c:133
+#: src/gpaexportfileop.c:139
 msgid "Export public keys to file"
 msgstr "Genel anahtarlarý dosyaya aktar"
 
-#: src/gpaexportfileop.c:137
+#: src/gpaexportfileop.c:150
 msgid "_armor"
 msgstr "_kalkan"
 
-#: src/gpaexportfileop.c:171
+#: src/gpaexportfileop.c:182
 #, c-format
 msgid "The keys have been exported to %s."
 msgstr "Anahtarlar %s isimli dosyaya aktarýldý."
@@ -692,6 +425,18 @@
 "sunucusuna gönderilecektir.\n"
 "Bu anahtarý daðýtmak istediðinizden emin misiniz?"
 
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:459
+#: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
+#: src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "_Evet"
+
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:460
+#: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
+#: src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "_Hayýr"
+
 #: src/gpaexportserverop.c:187
 msgid "The keys have been sent to the server."
 msgstr "Anahtarlar sunucuya yollandý."
@@ -700,29 +445,29 @@
 msgid "Decrypting..."
 msgstr "Çözüyor..."
 
-#: src/gpafiledecryptop.c:358 src/gpafileverifyop.c:449
+#: src/gpafiledecryptop.c:367 src/gpafileverifyop.c:464
 #, fuzzy, c-format
 msgid "\"%s\" contained no OpenPGP data."
 msgstr "\"%s\" dosyasý OpenPGP verisi içermiyor."
 
-#: src/gpafiledecryptop.c:359 src/gpafileverifyop.c:450
+#: src/gpafiledecryptop.c:368 src/gpafileverifyop.c:465
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no OpenPGPdata."
 msgstr "\"%s\" dosyasý OpenPGP verisi içermiyor."
 
-#: src/gpafiledecryptop.c:369
+#: src/gpafiledecryptop.c:378
 #, fuzzy, c-format
 msgid "\"%s\" contained no valid encrypted data."
 msgstr "\"%s\" dosyasý þifrelenmiþ geçerli veri içermiyor."
 
-#: src/gpafiledecryptop.c:371
+#: src/gpafiledecryptop.c:380
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no validencrypted data."
 msgstr "\"%s\" dosyasý þifrelenmiþ geçerli veri içermiyor."
 
-#: src/gpafiledecryptop.c:380 src/gpafileencryptop.c:727
-#: src/gpafilesignop.c:510 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
-#: src/gpakeypasswdop.c:197 src/gpakeysignop.c:229
+#: src/gpafiledecryptop.c:389 src/gpafileencryptop.c:751
+#: src/gpafilesignop.c:525 src/gpafileverifyop.c:475 src/gpakeyexpireop.c:240
+#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:237
 msgid "Wrong passphrase!"
 msgstr "Hatalý þifre!"
 
@@ -730,61 +475,60 @@
 msgid "Encrypting..."
 msgstr "Þifreliyor..."
 
-#: src/gpafileencryptop.c:453 src/verifydlg.c:222
+#: src/gpafileencryptop.c:457 src/verifydlg.c:222
 msgid "Unknown Key"
 msgstr "Bilinmeyen Anahtar"
 
-#: src/gpafileencryptop.c:469
+#: src/gpafileencryptop.c:473
 #, fuzzy
 msgid "You are going to encrypt a document using the following key:"
 msgstr "Bir dosyayý þu anahtarý kullanarak þifrelemek üzeresiniz:"
 
-#: src/gpafileencryptop.c:475
+#: src/gpafileencryptop.c:479
 msgid "However, it is not certain that the key belongs to that person."
 msgstr "Yine de, anahtarýn o kiþiye ait olduðu kesin deðil."
 
-#: src/gpafileencryptop.c:481
+#: src/gpafileencryptop.c:485
 msgid "Do you <b>really</b> want to use this key?"
 msgstr "Bu anahtarý <b>gerçekten</b> kullanmak istiyor musunuz?"
 
-#: src/gpafileencryptop.c:502 src/gpafileencryptop.c:542 src/verifydlg.c:227
+#: src/gpafileencryptop.c:506 src/gpafileencryptop.c:546 src/verifydlg.c:227
 msgid "Revoked Key"
 msgstr "Feshedilmiþ Anahtar"
 
-#: src/gpafileencryptop.c:504 src/gpafileencryptop.c:544 src/gpawizard.c:281
-#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:422
-#: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
+#: src/gpafileencryptop.c:508 src/gpafileencryptop.c:548 src/gtktools.c:52
+#: src/gtktools.c:86 src/keyeditdlg.c:149 src/verifydlg.c:115
 msgid "_Close"
 msgstr "_Kapat"
 
-#: src/gpafileencryptop.c:517
+#: src/gpafileencryptop.c:521
 msgid "The following key has been revoked by it's owner:"
 msgstr "Þu anahtar sahibi tarafýndan feshedilmiþtir:"
 
-#: src/gpafileencryptop.c:522 src/gpafileencryptop.c:565
+#: src/gpafileencryptop.c:526 src/gpafileencryptop.c:569
 msgid "And can not be used for encryption."
 msgstr "Ve þifreleme için kullanýlamaz."
 
-#: src/gpafileencryptop.c:557
+#: src/gpafileencryptop.c:561
 #, c-format
 msgid "The following key expired on %s:"
 msgstr "Þu anahtar %s tarihinde sona ermiþtir:"
 
-#: src/gpafileencryptop.c:641 src/gpafilesignop.c:414
+#: src/gpafileencryptop.c:600 src/gpafilesignop.c:448
+msgid ""
+"The selected certificates are not all of the same type. That is, you mixed "
+"OpenPGP and X.509 certificates. Please make sure to select only certificates "
+"of the same type."
+msgstr ""
+
+#: src/gpafileencryptop.c:675 src/gpafilesignop.c:434
 msgid "You didn't select any key for signing"
 msgstr "Þifreleme için hiçbir anahtar seçmediniz"
 
-#: src/gpafilesignop.c:148
+#: src/gpafilesignop.c:157
 msgid "Signing..."
 msgstr "Þifreliyor..."
 
-#: src/gpafilesignop.c:428
-msgid ""
-"The selected certificates are not all of the same type. That is, you mixed "
-"OpenPGP and X.509 certificates. Please make sure to select only certificates "
-"of the same type."
-msgstr ""
-
 #: src/gpafileverifyop.c:101
 msgid "Verifying..."
 msgstr "Doðruluyor..."
@@ -802,15 +546,15 @@
 msgid "Generating Key..."
 msgstr "Anahtar Yaratýlýyor..."
 
-#: src/gpaimportfileop.c:131
+#: src/gpaimportfileop.c:132
 msgid "Import public keys from file"
 msgstr "Genel anahtarlarý dosyadan al"
 
-#: src/gpaimportop.c:197
+#: src/gpaimportop.c:196
 msgid "No keys were found."
 msgstr "Hiçbir anahtar bulunamadý."
 
-#: src/gpaimportop.c:205
+#: src/gpaimportop.c:204
 #, c-format
 msgid ""
 "%i public keys read\n"
@@ -827,35 +571,35 @@
 "%i gizli anahtar dýþarýdan alýndý\n"
 "%i gizli anahtar deðiþtirilmedi"
 
-#: src/gpakeyexpireop.c:239
+#: src/gpakeyexpireop.c:244
 msgid ""
 "Invalid time given.\n"
 "(you may not set the expiration time to the past.)"
 msgstr ""
 
-#: src/gpakeyselector.c:86 src/keylist.c:567 src/siglist.c:94
+#: src/gpakeyselector.c:86 src/keylist.c:555 src/siglist.c:94
 #: src/siglist.c:114 src/verifydlg.c:324
 msgid "Key ID"
 msgstr "Anahtar Kimliði"
 
-#: src/gpakeyselector.c:95 src/keylist.c:618 src/siglist.c:100
+#: src/gpakeyselector.c:95 src/keylist.c:606 src/siglist.c:100
 #: src/siglist.c:143 src/verifydlg.c:336
 msgid "User Name"
 msgstr "Kullanýcý Adý"
 
-#: src/gpakeysignop.c:188
+#: src/gpakeysignop.c:191
 msgid "No private key for signing."
 msgstr "Þifreleme için hiçbir özel anahtar bulunamadý."
 
-#: src/gpakeysignop.c:233
+#: src/gpakeysignop.c:241
 msgid "This key has expired! Unable to sign."
 msgstr "Bu anahtar bitmiþ! Ýmzalama gerçekleþtirilemedi."
 
-#: src/gpakeysignop.c:237
+#: src/gpakeysignop.c:245
 msgid "This key has already been signed with your own!"
 msgstr "Bu anahtar zaten kendiniz tarafýndan imzalanmýþ!"
 
-#: src/gpakeysignop.c:242
+#: src/gpakeysignop.c:250
 msgid "You haven't selected a default key to sign with!"
 msgstr "Ýmzalamak için varsayýlan bir anahtar seçmediniz!"
 
@@ -883,7 +627,7 @@
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: src/gparecvkeydlg.c:101
+#: src/gparecvkeydlg.c:106
 msgid "Which key do you want to import? (The key must be specified by key ID)."
 msgstr ""
 "Hangi anahtarý dýþarýdan almak istiyorsunuz? (Anahtar, kimliði ile "
@@ -909,7 +653,7 @@
 msgid "Size"
 msgstr "Boyut"
 
-#: src/gpasubkeylist.c:97 src/keyeditdlg.c:171 src/keylist.c:580
+#: src/gpasubkeylist.c:97 src/keyeditdlg.c:168 src/keylist.c:568
 msgid "Expiry Date"
 msgstr "Bitim Tarihi"
 
@@ -929,16 +673,16 @@
 msgid "Can authenticate"
 msgstr "Doðrulayabilir"
 
-#: src/gpasubkeylist.c:137 src/gpgmetools.c:613 src/gpgmetools.c:821
-#: src/gpgmetools.c:940
+#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:833
+#: src/gpgmetools.c:952
 msgid "Revoked"
 msgstr "Feshedilmiþ"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:615 src/gpgmetools.c:936
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:948
 msgid "Expired"
 msgstr "Sona Ermiþ"
 
-#: src/gpasubkeylist.c:145 src/gpgmetools.c:617
+#: src/gpasubkeylist.c:145 src/gpgmetools.c:626
 msgid "Disabled"
 msgstr "Geçersiz Kýlýnmýþ"
 
@@ -946,41 +690,41 @@
 msgid "Unsigned"
 msgstr "Ýmzalanmamýþ"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:927 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:939 src/verifydlg.c:212
 msgid "Valid"
 msgstr "Geçerli"
 
-#: src/gpawidgets.c:72 src/gpgmetools.c:661 src/gpgmetools.c:668
-#: src/keyring.c:1176 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
+#: src/keyring.c:1248 src/keysigndlg.c:100
 msgid "User Name:"
 msgstr "Kullanýcý Adý:"
 
-#: src/gpawidgets.c:72 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/keysigndlg.c:100
 msgid "User Names:"
 msgstr "Kullanýcý Adlarý:"
 
-#: src/gpawidgets.c:78 src/gpgmetools.c:662 src/gpgmetools.c:669
-#: src/keyring.c:1178
+#: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
+#: src/keyring.c:1250
 msgid "Key ID:"
 msgstr "Anahtar Kimliði:"
 
-#: src/gpawidgets.c:194
+#: src/gpawidgets.c:180
 msgid "Expiration"
 msgstr "Sona Erme"
 
-#: src/gpawidgets.c:201
+#: src/gpawidgets.c:187
 msgid "_indefinitely valid"
 msgstr "_sýnýrsýzca geçerli"
 
-#: src/gpawidgets.c:210
+#: src/gpawidgets.c:195
 msgid "expire _after"
 msgstr "þu _tarihten sonra sona er"
 
-#: src/gpawidgets.c:229
+#: src/gpawidgets.c:215
 msgid "expire o_n:"
 msgstr "þu ta_rihte sona er:"
 
-#: src/gpawidgets.c:302 src/keygendlg.c:295
+#: src/gpawidgets.c:289 src/keygendlg.c:291
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -988,20 +732,7 @@
 "!TEHLÝKELÝ HATA!\n"
 "Bitim tarihi için geçersiz ekleme biçimi."
 
-#: src/gpawizard.c:260
-#, fuzzy
-msgid "_Back"
-msgstr "/_Yedekle..."
-
-#: src/gpawizard.c:267
-msgid "_Forward"
-msgstr ""
-
-#: src/gpawizard.c:274
-msgid "_Apply"
-msgstr ""
-
-#: src/gpgmetools.c:58
+#: src/gpgmetools.c:59
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -1018,7 +749,7 @@
 "\n"
 "Uygulama kapatýlacaktýr"
 
-#: src/gpgmetools.c:72
+#: src/gpgmetools.c:73
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -1037,8 +768,17 @@
 "Bu büyük ihtimalle GPA'deki bir hata.\n"
 "GPA þimdi bu hatadan toparlanmaya çalýþacaktýr."
 
-#: src/gpgmetools.c:477
+#: src/gpgmetools.c:139
+#, c-format
 msgid ""
+"The file %s already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s dosyasý zaten var. \n"
+"Üzerine yazmak istiyor musunuz?"
+
+#: src/gpgmetools.c:486
+msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
 "* a safe place.                                                        *\n"
@@ -1051,7 +791,7 @@
 "************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:482
+#: src/gpgmetools.c:491
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -1059,107 +799,107 @@
 "Bu dosyada yedeklenmiþ olan anahtar:\n"
 "\n"
 
-#: src/gpgmetools.c:543
+#: src/gpgmetools.c:552
 msgid "DSA and ElGamal (default)"
 msgstr "DSA ve ElGamal (varsayýlan)"
 
-#: src/gpgmetools.c:544
+#: src/gpgmetools.c:553
 msgid "DSA (sign only)"
 msgstr "DSA (sadece imzalama)"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:554
 msgid "RSA (sign only)"
 msgstr "RSA (sadece imzalama)"
 
-#: src/gpgmetools.c:581 src/gpgmetools.c:604 src/gpgmetools.c:621
-#: src/gpgmetools.c:932 src/gpgmetools.c:965
+#: src/gpgmetools.c:590 src/gpgmetools.c:613 src/gpgmetools.c:630
+#: src/gpgmetools.c:944 src/gpgmetools.c:977
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: src/gpgmetools.c:584
+#: src/gpgmetools.c:593
 msgid "Never"
 msgstr "Hiç"
 
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:596
 msgid "Marginal"
 msgstr "Sýnýrlý"
 
-#: src/gpgmetools.c:590
+#: src/gpgmetools.c:599
 msgid "Full"
 msgstr "Tam"
 
-#: src/gpgmetools.c:593
+#: src/gpgmetools.c:602
 msgid "Ultimate"
 msgstr "Sonsuz"
 
-#: src/gpgmetools.c:619
+#: src/gpgmetools.c:628
 msgid "Incomplete"
 msgstr "Eksik"
 
-#: src/gpgmetools.c:625
+#: src/gpgmetools.c:634
 msgid "Fully Valid"
 msgstr "Tamamen Geçerli"
 
-#: src/gpgmetools.c:659
+#: src/gpgmetools.c:668
 msgid "Please enter the passphrase for the following key:"
 msgstr "Lütfen þu anahtar için þifre girin:"
 
-#: src/gpgmetools.c:667
+#: src/gpgmetools.c:676
 msgid "Wrong passphrase, please try again:"
 msgstr "Hatalý þifre, lütfen tekrar deneyin:"
 
-#: src/gpgmetools.c:692
+#: src/gpgmetools.c:701
 msgid "Enter Passphrase"
 msgstr "Þifreyi Girin"
 
-#: src/gpgmetools.c:814
+#: src/gpgmetools.c:826
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:904 src/verifydlg.c:269
+#: src/gpgmetools.c:916 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[Bilinmeyen kullanýcý kimliði]"
 
-#: src/gpgmetools.c:930 src/verifydlg.c:217
+#: src/gpgmetools.c:942 src/verifydlg.c:217
 msgid "Bad"
 msgstr "Kötü"
 
-#: src/gpgmetools.c:953
+#: src/gpgmetools.c:965
 msgid "Generic"
 msgstr "Genel"
 
-#: src/gpgmetools.c:956
+#: src/gpgmetools.c:968
 msgid "Persona"
 msgstr "Kiþisel"
 
-#: src/gpgmetools.c:959
+#: src/gpgmetools.c:971
 msgid "Casual"
 msgstr "Hafif"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:974
 msgid "Positive"
 msgstr "Olumlu"
 
-#: src/gpgmetools.c:980
+#: src/gpgmetools.c:992
 msgid "The key can be used for certification, signing and encryption."
 msgstr "Anahtar onaylama, imzalama, ve þifreleme için kullanýlabilir."
 
-#: src/gpgmetools.c:983
+#: src/gpgmetools.c:995
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "Anahtar onaylama ve imzalama için kullanýlabilir ama þifreleme için "
 "kullanýlamaz."
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:1001
 msgid "The key can be used for certification and encryption."
 msgstr "Anahtar onaylama ve þifreleme için kullanýlabilir."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:1004
 msgid "The key can be used only for certification."
 msgstr "Anahtar sadece onaylama için kullanýlabilir."
 
-#: src/gpgmetools.c:1000
+#: src/gpgmetools.c:1012
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -1167,82 +907,71 @@
 "Anahtar sadece imzalama ve þifreleme için kullanýlabilir, ama onaylama için "
 "kullanýlamaz."
 
-#: src/gpgmetools.c:1003
+#: src/gpgmetools.c:1015
 msgid "The key can be used only for signing."
 msgstr "Anahtar sadece imzalama için kullanýlabilir."
 
-#: src/gpgmetools.c:1008
+#: src/gpgmetools.c:1020
 msgid "The key can be used only for encryption."
 msgstr "Anahtar sadece þifreleme için kullanýlabilir."
 
-#: src/gpgmetools.c:1011
+#: src/gpgmetools.c:1023
 msgid "This key is useless."
 msgstr "Bu anahtar iþe yaramaz."
 
-#: src/gtktools.c:320
+#: src/gtktools.c:48
 msgid "GPA Error"
 msgstr "GPA Hatasý"
 
-#: src/helpmenu.c:202
+#: src/helpmenu.c:83
 msgid "About GPA"
 msgstr "GPA Hakkýnda"
 
-#: src/helpmenu.c:247
-msgid "Brought to you by:"
-msgstr "Size bunu saðlayan:"
+#: src/helpmenu.c:89
+#, fuzzy
+msgid "GPA is the GNU Privacy Assistant."
+msgstr "GNU Gizlilik Asistanýný Anlamak"
 
-#: src/helpmenu.c:284
+#: src/icons.c:199
 #, fuzzy
-msgid "GPA is Free Software under the"
-msgstr "GPA, GNU Genel Kamu Lisansý altýnda"
+msgid "_Verify"
+msgstr "Doðrula"
 
-#: src/helpmenu.c:288
-msgid "GNU General Public License."
-msgstr "bir özgür yazýlýmdýr."
+#: src/icons.c:200
+#, fuzzy
+msgid "_Encrypt"
+msgstr "Þifrele"
 
-#: src/helpmenu.c:292
-msgid "For news see:"
-msgstr "Yenilikler için:"
+#: src/icons.c:201
+#, fuzzy
+msgid "_Decrypt"
+msgstr "Çöz"
 
-#: src/helpmenu.c:297
+#: src/icons.c:202
 #, fuzzy
-msgid "http://www.gpg4win.org"
-msgstr "http://www.gnupg.org"
+msgid "_Brief"
+msgstr "Özet"
 
-#: src/helpmenu.c:299
-msgid "http://www.gnupg.org"
-msgstr "http://www.gnupg.org"
+#: src/icons.c:203
+#, fuzzy
+msgid "_Detailed"
+msgstr "Detaylý"
 
-#: src/helpmenu.c:382
+#: src/icons.c:204
 #, fuzzy
-msgid "GNU General Public License"
-msgstr "bir özgür yazýlýmdýr."
+msgid "_Keyring Editor"
+msgstr "Anahtarlýk Düzenleyicisi"
 
-#: src/helpmenu.c:409
+#: src/icons.c:205
 #, fuzzy
-msgid "_GNU General Public License"
-msgstr "bir özgür yazýlýmdýr."
+msgid "_Clipboard"
+msgstr "/Pencereler/_Dosya Yöneticisi"
 
-#: src/helpmenu.c:436
-msgid "Show Help Text\n"
-msgstr "Yardým Yazýsýný Göster\n"
+#: src/icons.c:206
+#, fuzzy
+msgid "_File Manager"
+msgstr "dosya yöneticisi"
 
-#: src/helpmenu.c:444
-msgid "/_Help"
-msgstr "/_Yardým"
-
-#: src/helpmenu.c:446
-msgid "/Help/_Contents"
-msgstr "/Yardým/_Ýçindekiler"
-
-#: src/helpmenu.c:449
-msgid "/Help/_License"
-msgstr "/Yardým/_Lisans"
-
-#: src/helpmenu.c:450
-msgid "/Help/_About"
-msgstr "/Yardým/_Hakkýnda"
-
 #: src/keydeletedlg.c:41
 msgid "Removing Secret Key"
 msgstr "Gizli Anahtar Kaldýrýlýyor"
@@ -1289,23 +1018,27 @@
 msgid "Are you sure you want to delete this key?"
 msgstr "Bu anahtarý silmek istediðinize emin misiniz?"
 
-#: src/keyeditdlg.c:149
+#: src/keyeditdlg.c:147
 msgid "Edit Key"
 msgstr "Anahtarý Düzenle"
 
-#: src/keyeditdlg.c:165
+#: src/keyeditdlg.c:162
 msgid "Change _passphrase"
 msgstr "_Þifreyi Deðiþtir"
 
-#: src/keyeditdlg.c:185
+#: src/keyeditdlg.c:182
 msgid "Change _expiration"
 msgstr "_Bitim süresini deðiþtir"
 
-#: src/keygendlg.c:58
+#: src/keygendlg.c:67
+msgid "You must enter a key size."
+msgstr ""
+
+#: src/keygendlg.c:72
 msgid "You must enter a User ID."
 msgstr ""
 
-#: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
+#: src/keygendlg.c:77 src/passwddlg.c:45
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -1313,7 +1046,7 @@
 "\"Þifre\" ve \"Þifre tekrar\" bölümlerinde,\n"
 "ayný þifreyi girmelisiniz."
 
-#: src/keygendlg.c:70 src/keygenwizard.c:314 src/passwddlg.c:52
+#: src/keygendlg.c:84 src/passwddlg.c:52
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1321,7 +1054,7 @@
 "Bir þifre girmediniz.\n"
 "Bu özel þifrenizi korumak için gerekli."
 
-#: src/keygendlg.c:83 src/keygenwizard.c:328 src/passwddlg.c:65
+#: src/keygendlg.c:97 src/passwddlg.c:65
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1333,23 +1066,25 @@
 "\n"
 "Lütfen yeni bir þifre girin."
 
-#: src/keygendlg.c:88 src/keygenwizard.c:333 src/passwddlg.c:70
+#: src/keygendlg.c:102 src/passwddlg.c:70
 msgid "_Enter new passphrase"
 msgstr "_Yeni þifre gir"
 
-#: src/keygendlg.c:89 src/keygenwizard.c:334 src/passwddlg.c:71
+#: src/keygendlg.c:104 src/passwddlg.c:71
 msgid "Take this one _anyway"
 msgstr "Her _durumda bunu kullan"
 
-#: src/keygendlg.c:144 src/keygenwizard.c:541
+#: src/keygendlg.c:150 src/keygenwizard.c:571 src/keygenwizard.c:584
+#: src/keygenwizard.c:594 src/keygenwizard.c:604 src/keygenwizard.c:616
+#: src/keygenwizard.c:633 src/keygenwizard.c:645
 msgid "Generate key"
 msgstr "Anahtar yarat"
 
-#: src/keygendlg.c:185
+#: src/keygendlg.c:177
 msgid "_Algorithm: "
 msgstr "_Algoritma: "
 
-#: src/keygendlg.c:197
+#: src/keygendlg.c:192
 msgid "_Key size (bits): "
 msgstr "_Anahtar boyutu (bits): "
 
@@ -1365,27 +1100,27 @@
 msgid "2048"
 msgstr "2048"
 
-#: src/keygendlg.c:216
+#: src/keygendlg.c:206
 msgid "_User ID: "
 msgstr "_Kullanýcý Kimliði: "
 
-#: src/keygendlg.c:226
+#: src/keygendlg.c:217
 msgid "_Email: "
 msgstr "_Email: "
 
-#: src/keygendlg.c:236
+#: src/keygendlg.c:226
 msgid "_Comment: "
 msgstr "_Yorum: "
 
-#: src/keygendlg.c:248
+#: src/keygendlg.c:235
 msgid "_Passphrase: "
 msgstr "_Þifre: "
 
-#: src/keygendlg.c:260
+#: src/keygendlg.c:246
 msgid "_Repeat passphrase: "
 msgstr "Þifre _Tekrar: "
 
-#: src/keygenwizard.c:152
+#: src/keygenwizard.c:172
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1397,19 +1132,16 @@
 "Ýsminiz diðerlerinin anahtarlarý tanýmasýný kolaylaþtýrmak için yeni "
 "anahtarýn bir parçasý olacaktýr."
 
-#: src/keygenwizard.c:157
+#: src/keygenwizard.c:175
 msgid "Your Name:"
 msgstr "Ýsminiz:"
 
-#: src/keygenwizard.c:170
-msgid "Please insert your name"
-msgstr "Lütfen isminizi girin"
-
-#: src/keygenwizard.c:183
+#: src/keygenwizard.c:211
+#, fuzzy
 msgid ""
 "Please insert your email address.\n"
 "\n"
-" Your email address will be part of the new key to make it easier for others "
+"Your email address will be part of the new key to make it easier for others "
 "to identify keys. If you have several email addresses, you can add further "
 "email adresses later."
 msgstr ""
@@ -1419,27 +1151,40 @@
 "yeni anahtarýn bir parçasý olacaktýr. Birden fazla email adresiniz varsa, "
 "daha sonra baþka email adresleri ekleyebilirsiniz."
 
-#: src/keygenwizard.c:190
+#: src/keygenwizard.c:215
 msgid "Your Email Address:"
 msgstr "Email Adresiniz:"
 
-#: src/keygenwizard.c:205
-msgid "Please insert your email address"
-msgstr "Lütfen email adresinizi girin"
-
-#: src/keygenwizard.c:239
+#: src/keygenwizard.c:319
 msgid "Please choose a passphrase for the new key."
 msgstr "Lütfen yeni anahtar için bir þifre seçin."
 
-#: src/keygenwizard.c:248 src/passwddlg.c:108
+#: src/keygenwizard.c:326
+#, fuzzy
+msgid ""
+"In \"Passphrase\" and \"Repeat passphrase\", you must enter the same "
+"passphrase."
+msgstr ""
+"\"Þifre\" ve \"Þifre tekrar\" bölümlerinde,\n"
+"ayný þifreyi girmelisiniz."
+
+#: src/keygenwizard.c:335
+msgid "Warning: The passphrase you have entered is not very secure."
+msgstr ""
+
+#: src/keygenwizard.c:350
+msgid "Quality: "
+msgstr ""
+
+#: src/keygenwizard.c:358 src/passwddlg.c:111
 msgid "Passphrase: "
 msgstr "Þifre: "
 
-#: src/keygenwizard.c:261 src/passwddlg.c:117
+#: src/keygenwizard.c:370 src/passwddlg.c:120
 msgid "Repeat Passphrase: "
 msgstr "Þifre Tekrar: "
 
-#: src/keygenwizard.c:358
+#: src/keygenwizard.c:412
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1450,15 +1195,15 @@
 "\n"
 "Yedek kopya yaratmak istiyor musunuz?"
 
-#: src/keygenwizard.c:367
+#: src/keygenwizard.c:420
 msgid "Create _backup copy"
 msgstr "Yedek _kopya yarat"
 
-#: src/keygenwizard.c:374 src/keyring.c:739 src/keyring.c:767
+#: src/keygenwizard.c:425 src/keyring.c:737 src/keyring.c:763
 msgid "Do it _later"
 msgstr "So_nra yap"
 
-#: src/keygenwizard.c:402
+#: src/keygenwizard.c:454
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1468,7 +1213,7 @@
 "\n"
 "Bu iþlem hýzlý bilgisayarlarda bile uzun sürebilir. Lütfen sabýrlý olun."
 
-#: src/keygenwizard.c:411
+#: src/keygenwizard.c:463
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1488,44 +1233,44 @@
 "GnuPG güven veritabanýný yeniden yapýlandýrýyor.\n"
 "Bu birkaç saniyenizi alabilir."
 
-#: src/keylist.c:559
+#: src/keylist.c:547
 msgid ""
 "This columns lists the type of the certificate.  A 'P' denotes OpenPGP and a "
 "'X' denotes X.509 (S/MIME)."
 msgstr ""
 
-#: src/keylist.c:568
+#: src/keylist.c:556
 #, fuzzy
 msgid "The key ID is a short number to identify a certificate."
 msgstr "Anahtar sadece onaylama için kullanýlabilir."
 
-#: src/keylist.c:581
+#: src/keylist.c:569
 msgid "The Expiry Date is the date until the certificate is valid."
 msgstr ""
 
-#: src/keylist.c:591 src/ownertrustdlg.c:122
+#: src/keylist.c:579 src/ownertrustdlg.c:123
 msgid "Owner Trust"
 msgstr "Sahibine Güven"
 
-#: src/keylist.c:592
+#: src/keylist.c:580
 msgid ""
 "The Owner Trust has been set by you and describes how far you trust the "
 "holder of the certificate to correctly sign (certify) other certificates.  "
 "It is only meaningful for OpenPGP."
 msgstr ""
 
-#: src/keylist.c:604
+#: src/keylist.c:592
 #, fuzzy
 msgid "Validity"
 msgstr "Anahtar Geçerliliði"
 
-#: src/keylist.c:605
+#: src/keylist.c:593
 msgid ""
 "The Validity describes the trust level the system has in this certificate.  "
 "That is how sure it is that the named user is actually that user."
 msgstr ""
 
-#: src/keylist.c:619
+#: src/keylist.c:607
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
@@ -1535,7 +1280,7 @@
 msgid "No keys selected for signing."
 msgstr "Ýmzalamak için hiçbir anahtar seçilmedi."
 
-#: src/keyring.c:734
+#: src/keyring.c:732
 msgid ""
 "You do not have a private key yet. Do you want to generate one now "
 "(recommended) or do it later?"
@@ -1543,11 +1288,11 @@
 "Hala bir özel anahtara sahip deðilsiniz. Bir tane yaratmak ister misiniz "
 "(önerilen) ya da daha sonra da yapabilirsiniz?"
 
-#: src/keyring.c:738
+#: src/keyring.c:736
 msgid "_Generate key now"
 msgstr "Anahtarý þimdi _yarat"
 
-#: src/keyring.c:761
+#: src/keyring.c:757
 msgid ""
 "You do not have a backup copy of your private key yet. Do you want to backup "
 "your key now (recommended) or do it later?"
@@ -1555,338 +1300,245 @@
 "Hala özel anahtarýnýzýn bir yedek kopyasýna sahip deðilsiniz. Anahtarýnýzý "
 "þimdi mi yedeklemek istersiniz (önerilen) ya da daha sonra da yapabilirsiniz?"
 
-#: src/keyring.c:766
+#: src/keyring.c:762
 msgid "_Backup key now"
 msgstr "Anahtarý þimdi ye_dekle"
 
-#: src/keyring.c:883
-msgid "/_Keys"
-msgstr "/_Anahtarlar"
-
-#: src/keyring.c:884
-msgid "/Keys/_Refresh"
-msgstr ""
-
 #: src/keyring.c:886
 #, fuzzy
-msgid "/Keys/sep0"
-msgstr "/Anahtarlar/bol1"
+msgid "_Keys"
+msgstr "/_Anahtarlar"
 
 #: src/keyring.c:887
-msgid "/Keys/_New Key..."
-msgstr "/Anahtarlar/_Yeni Anahtar..."
+#, fuzzy
+msgid "_Server"
+msgstr "/_Sunucu"
 
-#: src/keyring.c:889
-msgid "/Keys/_Delete Keys..."
-msgstr "/Anahtarlar/Anahtarlarý _Sil..."
+#: src/keyring.c:901
+msgid "Select all certificates"
+msgstr ""
 
-#: src/keyring.c:891
-msgid "/Keys/sep1"
-msgstr "/Anahtarlar/bol1"
+#: src/keyring.c:906
+msgid "Refresh the keyring"
+msgstr ""
 
-#: src/keyring.c:892
-msgid "/Keys/_Sign Keys..."
-msgstr "/Anahtarlar/Anahtarlarý Ý_mzala..."
+#: src/keyring.c:907
+#, fuzzy
+msgid "_New key..."
+msgstr "/Anahtarlar/_Yeni Anahtar..."
 
-#: src/keyring.c:893
-msgid "/Keys/Set _Owner Trust..."
-msgstr "/Anahtarlar/Sahibine _Güveni Belirle..."
+#: src/keyring.c:908
+#, fuzzy
+msgid "Generate a new key"
+msgstr "Anahtar yarat"
 
-#: src/keyring.c:894
-msgid "/Keys/_Edit Private Key..."
-msgstr "/Anahtarlar/Özel Anahtarý _Düzenle..."
+#: src/keyring.c:909
+#, fuzzy
+msgid "_Delete keys"
+msgstr "/Anahtarlarý _Sil..."
 
-#: src/keyring.c:895
-msgid "/Keys/sep2"
-msgstr "/Anahtarlar/bol2"
+#: src/keyring.c:910
+msgid "Remove the selected key"
+msgstr "Seçili anahtarý kaldýr"
 
-#: src/keyring.c:896
-msgid "/Keys/_Import Keys..."
-msgstr "/Anahtarlar/A_nahtarlarý Dýþarýdan Al..."
+#: src/keyring.c:911
+#, fuzzy
+msgid "_Sign Keys..."
+msgstr "/Anahtarlarý Ým_zala..."
 
-#: src/keyring.c:897
-msgid "/Keys/E_xport Keys..."
-msgstr "/Anahtarlar/Ana_htarlarý Yaz..."
+#: src/keyring.c:912
+msgid "Sign the selected key"
+msgstr "Seçili anahtarý imzala"
 
-#: src/keyring.c:898
-msgid "/Keys/_Backup..."
-msgstr "/Anahtarlar/Yed_ekle..."
+#: src/keyring.c:913
+#, fuzzy
+msgid "Set _Owner Trust..."
+msgstr "/Sahibine _Güveni Belirle..."
 
-#: src/keyring.c:901
-msgid "/_Server"
-msgstr "/_Sunucu"
+#: src/keyring.c:914
+#, fuzzy
+msgid "Set owner trust of the selected key"
+msgstr "Seçili anahtarý kaldýr"
 
-#: src/keyring.c:902
-msgid "/Server/_Retrieve Keys..."
-msgstr "/Sunucu/A_nahtarlarý Edin..."
+#: src/keyring.c:916
+#, fuzzy
+msgid "_Edit Private Key..."
+msgstr "/Özel Anahtarý _Düzenle..."
 
-#: src/keyring.c:903
-msgid "/Server/_Send Keys..."
-msgstr "/Sunucu/Anahtarlarý _Gönder..."
+#: src/keyring.c:917
+msgid "Edit the selected private key"
+msgstr "Seçili özel anahtarý düzenle"
 
-#: src/keyring.c:908
+#: src/keyring.c:919
 #, fuzzy
-msgid "/Windows/_File Manager"
-msgstr "/Pencereler/_Dosya Yöneticisi"
+msgid "_Import Keys..."
+msgstr "Anahtarlarý Dýþarýdan Al"
 
-#: src/keyring.c:939
-msgid "/Keys/Export Keys..."
-msgstr "/Anahtarlar/Anahtarlarý Dýþarý Yaz..."
+#: src/keyring.c:920
+msgid "Import Keys"
+msgstr "Anahtarlarý Dýþarýdan Al"
 
-#: src/keyring.c:944
-msgid "/Keys/Delete Keys..."
-msgstr "/Anahtarlar/Anahtarlarý Sil..."
+#: src/keyring.c:921
+#, fuzzy
+msgid "E_xport Keys..."
+msgstr "/Anahtarlarý _Yaz..."
 
-#: src/keyring.c:952
-msgid "/Server/Send Keys..."
-msgstr "/Sunucu/Anahtarlarý Gönder..."
+#: src/keyring.c:922
+msgid "Export Keys"
+msgstr "Anahtarlarý Dýþarý Yaz"
 
-#: src/keyring.c:959
-msgid "/Keys/Set Owner Trust..."
-msgstr "/Anahtarlar/Sahibine Güveni Belirle..."
+#: src/keyring.c:923
+#, fuzzy
+msgid "_Backup..."
+msgstr "/_Yedekle..."
 
-#: src/keyring.c:966
-msgid "/Keys/Sign Keys..."
-msgstr "/Anahtarlar/Anahtarlarý Ýmzala..."
+#: src/keyring.c:924
+#, fuzzy
+msgid "Backup key"
+msgstr "Anahtarlarý Yedekle"
 
-#: src/keyring.c:972
-msgid "/Keys/Edit Private Key..."
-msgstr "/Anahtarlar/Özel Anahtarý Düzenle..."
+#: src/keyring.c:927
+#, fuzzy
+msgid "_Retrieve Keys..."
+msgstr "/Sunucu/A_nahtarlarý Edin..."
 
-#: src/keyring.c:977
-msgid "/Keys/Backup..."
-msgstr "/Anahtarlar/Yedekle..."
+#: src/keyring.c:928
+msgid "Retrieve keys from server"
+msgstr ""
 
-#: src/keyring.c:994
-msgid "/_Copy"
-msgstr "/_Kopyala"
-
-#: src/keyring.c:996
-msgid "/_Paste"
-msgstr "/_Yapýþtýr"
-
-#: src/keyring.c:998
-msgid "/_Delete Keys..."
-msgstr "/Anahtarlarý _Sil..."
-
-#: src/keyring.c:1001
-msgid "/_Sign Keys..."
+#: src/keyring.c:930
+#, fuzzy
+msgid "_Send Keys..."
 msgstr "/Anahtarlarý Ým_zala..."
 
-#: src/keyring.c:1002
-msgid "/Set _Owner Trust..."
-msgstr "/Sahibine _Güveni Belirle..."
+#: src/keyring.c:931
+#, fuzzy
+msgid "Send keys to server"
+msgstr "/Anahtarlarý Sunucuya _Gönder..."
 
-#: src/keyring.c:1003
-msgid "/_Edit Private Key..."
-msgstr "/Özel Anahtarý _Düzenle..."
+#: src/keyring.c:937
+msgid "Show Brief Keylist"
+msgstr "Özet Anahtar Listesi Göster"
 
-#: src/keyring.c:1005
-msgid "/E_xport Keys..."
-msgstr "/Anahtarlarý _Yaz..."
+#: src/keyring.c:939
+msgid "Show Key Details"
+msgstr "Anahtar Detaylarýný Göster"
 
-#: src/keyring.c:1006
-msgid "/Se_nd Keys to Server..."
-msgstr "/Anahtarlarý Sunucuya _Gönder..."
+#: src/keyring.c:1063
+msgid "Edit"
+msgstr "Düzenle"
 
-#: src/keyring.c:1007
-msgid "/_Backup..."
-msgstr "/_Yedekle..."
+#: src/keyring.c:1065
+#, fuzzy
+msgid "Delete"
+msgstr "/Düzen/_Tümünü Seç"
 
-#: src/keyring.c:1018
-msgid "/Set Owner Trust..."
-msgstr "/Sahibine Güveni Belirle..."
+#: src/keyring.c:1067
+msgid "Sign"
+msgstr "Ýmzala"
 
-#: src/keyring.c:1025
-msgid "/Sign Keys..."
-msgstr "Anahtarlarý Ýmzala..."
+#: src/keyring.c:1069
+msgid "Export"
+msgstr "Dýþarý Yaz"
 
-#: src/keyring.c:1031
-msgid "/Edit Private Key..."
-msgstr "Özel Anahtarý Düzenle..."
+#: src/keyring.c:1071
+msgid "Import"
+msgstr "Dýþarýdan Al"
 
-#: src/keyring.c:1036
-msgid "/Backup..."
-msgstr "/Yedekle..."
-
-#: src/keyring.c:1106
+#: src/keyring.c:1178
 msgid "Subkeys"
 msgstr "Altanahtarlar"
 
-#: src/keyring.c:1180 src/keysigndlg.c:110
+#: src/keyring.c:1252 src/keysigndlg.c:106
 msgid "Fingerprint:"
 msgstr "Parmakizi:"
 
-#: src/keyring.c:1182
+#: src/keyring.c:1254
 msgid "Expires at:"
 msgstr "Bitim tarihi:"
 
-#: src/keyring.c:1184
+#: src/keyring.c:1256
 msgid "Owner Trust:"
 msgstr "Sahibine Güven:"
 
-#: src/keyring.c:1186
+#: src/keyring.c:1258
 msgid "Key Validity:"
 msgstr "Anahtar Geçerliliði"
 
-#: src/keyring.c:1188
+#: src/keyring.c:1260
 msgid "Key Type:"
 msgstr "Anahtar Tipi:"
 
-#: src/keyring.c:1190
+#: src/keyring.c:1262
 msgid "Created at:"
 msgstr "Yaratýlma Tarihi:"
 
-#: src/keyring.c:1193
+#: src/keyring.c:1265
 msgid "Details"
 msgstr "Detaylar"
 
-#: src/keyring.c:1201
+#: src/keyring.c:1273
 msgid "Show signatures on user name:"
 msgstr "Þu kullanýcý adýndaki imzalarý göster:"
 
-#: src/keyring.c:1225
+#: src/keyring.c:1298
 msgid "Signatures"
 msgstr "Ýmzalar"
 
-#: src/keyring.c:1249
+#: src/keyring.c:1322
 msgid "The key has both a private and a public part"
 msgstr "Anahtar hem genel hem de özel bölümler içeriyor"
 
-#: src/keyring.c:1252
+#: src/keyring.c:1325
 msgid "The key has only a public part"
 msgstr "Anahtar sadece genel bölüme sahip"
 
-#: src/keyring.c:1287
+#: src/keyring.c:1360
 #, c-format
 msgid "%s %u bits"
 msgstr "%s %u bit"
 
-#: src/keyring.c:1312
+#: src/keyring.c:1385
 msgid "No keys selected"
 msgstr "Hiçbir anahtar seçilmedi"
 
-#: src/keyring.c:1315
+#: src/keyring.c:1388
 #, fuzzy, c-format
 msgid "%d key selected"
 msgid_plural "%d keys selected"
 msgstr[0] "%d anahtar seçildi"
 msgstr[1] "%d anahtar seçildi"
 
-#: src/keyring.c:1347
+#: src/keyring.c:1423
 msgid "All signatures"
 msgstr "Tüm imzalar"
 
-#: src/keyring.c:1552
-msgid "Edit"
-msgstr "Düzenle"
-
-#: src/keyring.c:1553
-msgid "Edit the selected private key"
-msgstr "Seçili özel anahtarý düzenle"
-
-#: src/keyring.c:1554
-msgid "edit key"
-msgstr "anahtarý düzenle"
-
-#: src/keyring.c:1562
-msgid "Remove the selected key"
-msgstr "Seçili anahtarý kaldýr"
-
-#: src/keyring.c:1563
-msgid "remove key"
-msgstr "anahtarý kaldýr"
-
-#: src/keyring.c:1571
-msgid "Sign the selected key"
-msgstr "Seçili anahtarý imzala"
-
-#: src/keyring.c:1571
-msgid "sign key"
-msgstr "anahtarý imzala"
-
 #: src/keyring.c:1578
-msgid "Import"
-msgstr "Dýþarýdan Al"
-
-#: src/keyring.c:1579
-msgid "Import Keys"
-msgstr "Anahtarlarý Dýþarýdan Al"
-
-#: src/keyring.c:1579
-msgid "import keys"
-msgstr "anahtarlarý dýþarýdan al"
-
-#: src/keyring.c:1584
-msgid "Export"
-msgstr "Dýþarý Yaz"
-
-#: src/keyring.c:1585
-msgid "Export Keys"
-msgstr "Anahtarlarý Dýþarý Yaz"
-
-#: src/keyring.c:1585
-msgid "export keys"
-msgstr "anahtarlarý dýþarý yaz"
-
-#: src/keyring.c:1598
-msgid "Brief"
-msgstr "Özet"
-
-#: src/keyring.c:1598
-msgid "Show Brief Keylist"
-msgstr "Özet Anahtar Listesi Göster"
-
-#: src/keyring.c:1599
-msgid "brief"
-msgstr "özet"
-
-#: src/keyring.c:1610
-msgid "Detailed"
-msgstr "Detaylý"
-
-#: src/keyring.c:1610
-msgid "Show Key Details"
-msgstr "Anahtar Detaylarýný Göster"
-
-#: src/keyring.c:1611
-msgid "detailed"
-msgstr "detaylý"
-
-#: src/keyring.c:1639
-msgid "Refresh the keyring"
-msgstr ""
-
-#: src/keyring.c:1640
-msgid "refresh keyring"
-msgstr ""
-
-#: src/keyring.c:1711
 #, fuzzy
 msgid "Selected default key:"
 msgstr "Seçili Varsayýlan Anahtar:"
 
-#: src/keyring.c:1721
+#: src/keyring.c:1588
 msgid "No default key selected in the preferences."
 msgstr ""
 
-#: src/keyring.c:1833
+#: src/keyring.c:1701
 msgid "GNU Privacy Assistant - Keyring Editor"
 msgstr "GNU Gizlilik Asistaný - Anahtarlýk Düzenleyicisi"
 
-#: src/keyring.c:1865
+#: src/keyring.c:1728
 msgid "Keyring Editor"
 msgstr "Anahtarlýk Düzenleyicisi"
 
-#: src/keysigndlg.c:60
+#: src/keysigndlg.c:59
 msgid "Sign Key"
 msgstr "Anahtarý Ýmzala"
 
-#: src/keysigndlg.c:76
+#: src/keysigndlg.c:72
 msgid "Do you want to sign the following key?"
 msgstr "Bu anahtarý imzalamak istediðiniza emin misiniz?"
 
-#: src/keysigndlg.c:120
+#: src/keysigndlg.c:116
 msgid ""
 "Check the name and fingerprint carefully to be sure that it really is the "
 "key you want to sign."
@@ -1894,19 +1546,19 @@
 "Bu anahtarýn gerçekten imzalamak istediðiniz anahtar olduðuna emin olmak "
 "için lütfen ismini ve parmakizini dikkatli kontrol edin."
 
-#: src/keysigndlg.c:128
+#: src/keysigndlg.c:124
 msgid "All user names in this key will be signed."
 msgstr "Bu anahtardaki bütün kullanýcý isimleri imzalanacaktýr."
 
-#: src/keysigndlg.c:134
+#: src/keysigndlg.c:130
 msgid "The key will be signed with your default private key."
 msgstr "Bu anahtar sizin varsayýlan özel anahtarýnýzla imzalanacaktýr."
 
-#: src/keysigndlg.c:141
+#: src/keysigndlg.c:137
 msgid "Sign only _locally"
 msgstr "Sadece _yerel olarak imzala"
 
-#: src/options.c:316
+#: src/options.c:323
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -1914,26 +1566,26 @@
 "Varsayýlan olarak seçmiþ olduðunuz özel anahtar artýk mevcut deðil. \n"
 "GPA kendiliðinden yeni bir varsayýlan anahtar seçmeye çalýþacak."
 
-#: src/ownertrustdlg.c:106
+#: src/ownertrustdlg.c:107
 msgid "Change key ownertrust"
 msgstr "Anahtarýn sahibine güveni deðiþtir"
 
-#: src/ownertrustdlg.c:130
+#: src/ownertrustdlg.c:131
 msgid "_Unknown"
 msgstr "_Bilinmiyor"
 
-#: src/ownertrustdlg.c:135
+#: src/ownertrustdlg.c:136
 msgid ""
 "You don't know how much to trust this user to verify other people's keys.\n"
 msgstr ""
 "Bu kullanýcýya diðer insanlarýn anahtarlarýný doðrulamada ne kadar "
 "güvenmeniz gerektiðini bilmiyorsunuz.\n"
 
-#: src/ownertrustdlg.c:145
+#: src/ownertrustdlg.c:146
 msgid "_Never"
 msgstr "_Hiç"
 
-#: src/ownertrustdlg.c:150
+#: src/ownertrustdlg.c:151
 msgid ""
 "You don't trust this user at all to verify the validity of other people's "
 "keys at all.\n"
@@ -1941,11 +1593,11 @@
 "Bu kullanýcýya diðer insanlarýn anahtarlarýnýn geçerliliðini doðrulamada hiç "
 "güvenmiyorsunuz.\n"
 
-#: src/ownertrustdlg.c:160
+#: src/ownertrustdlg.c:161
 msgid "_Marginal"
 msgstr "_Sýnýrlý"
 
-#: src/ownertrustdlg.c:165
+#: src/ownertrustdlg.c:166
 msgid ""
 "You don't trust this user's ability to verify the validity of other people's "
 "keys enough to consider keys valid based on his/her sole word.\n"
@@ -1959,11 +1611,11 @@
 "kullanýcý tarafýndan geçerli anahtarlarla imzalanmýþsa onu geçerli "
 "sayacaksýnýz.\n"
 
-#: src/ownertrustdlg.c:182
+#: src/ownertrustdlg.c:183
 msgid "_Full"
 msgstr "_Tam"
 
-#: src/ownertrustdlg.c:187
+#: src/ownertrustdlg.c:188
 msgid ""
 "You trust this user's ability to verify the validity of other people's keys "
 "so much, that you'll consider valid any key signed by him/her, provided this "
@@ -1973,11 +1625,11 @@
 "yeteneðine onun imzaladýðý herhangi bir anahtarý geçerli sayacak kadar çok "
 "güveniyorsunuz.\n"
 
-#: src/ownertrustdlg.c:200
+#: src/ownertrustdlg.c:201
 msgid "U_ltimate"
 msgstr "S_onsuz"
 
-#: src/ownertrustdlg.c:205
+#: src/ownertrustdlg.c:206
 msgid ""
 "You consider this key valid, and trust the user so much that you will "
 "consider any key signed by him/her fully valid.\n"
@@ -2069,37 +1721,147 @@
 "Belirttiðiniz anahtar sunucusu protokolü için\n"
 "mevcut bir plugin bulunamadý."
 
-#: src/server_access.c:528 src/server_access.c:574
+#: src/server_access.c:528 src/server_access.c:572
 msgid "The keyserver you specified is not valid"
 msgstr "Belittiðiniz anahtar sunucusu geçersiz"
 
-#: src/settingsdlg.c:59
+#: src/settingsdlg.c:133 src/siglist.c:135
+msgid "Local"
+msgstr "Yerel"
+
+#: src/settingsdlg.c:134
+msgid "Local, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:135
 #, fuzzy
+msgid "Local, PKA"
+msgstr "Yerel"
+
+#: src/settingsdlg.c:136
+msgid "Local, PKA, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:137
+msgid "Local, Keyserver, PKA"
+msgstr ""
+
+#: src/settingsdlg.c:138
+#, fuzzy
+msgid "Local, kDNS"
+msgstr "Yerel"
+
+#: src/settingsdlg.c:139
+msgid "Local, kDNS, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:140
+msgid "PKA"
+msgstr ""
+
+#: src/settingsdlg.c:141
+msgid "kDNS"
+msgstr ""
+
+#: src/settingsdlg.c:142
+msgid "Custom"
+msgstr ""
+
+#: src/settingsdlg.c:208
+#, fuzzy
+msgid "<b>User interface</b>"
+msgstr "U_zman modunu kullan:"
+
+#: src/settingsdlg.c:215
+#, fuzzy
+msgid "Use _advanced mode"
+msgstr "U_zman modunu kullan:"
+
+#: src/settingsdlg.c:221
+msgid "Show advanced _options"
+msgstr ""
+
+#: src/settingsdlg.c:272
+msgid ""
+"No default key has been selected.  This may lead to problems when signing or "
+"encrypting.  For example you might later not be able to read a mail written "
+"by you and encrypted to someone else.\n"
+"\n"
+"Please consider creating your own key and select it then."
+msgstr ""
+
+#: src/settingsdlg.c:278
+msgid "Continue without a default key"
+msgstr ""
+
+#: src/settingsdlg.c:280
+#, fuzzy
+msgid "Let me select a default key"
+msgstr "Seçili Varsayýlan Anahtar:"
+
+#: src/settingsdlg.c:305
+#, fuzzy
 msgid "<b>Default _key</b>"
 msgstr "Varsayýlan _anahtar:"
 
-#: src/settingsdlg.c:111
+#: src/settingsdlg.c:405
 #, fuzzy
 msgid "<b>Default key_server</b>"
 msgstr "Varsayýlan anahtar _sunucusu: "
 
-#: src/settingsdlg.c:158
+#: src/settingsdlg.c:602
 #, fuzzy
-msgid "<b>Use _advanced mode</b>"
-msgstr "U_zman modunu kullan:"
+msgid "<b>Auto key _locate</b>"
+msgstr "Varsayýlan anahtar _sunucusu: "
 
-#: src/settingsdlg.c:193
-msgid "Settings"
-msgstr "Ayarlar"
+#: src/settingsdlg.c:612
+msgid ""
+"The list of methods to locate keys via an email address.\n"
+"All given methods are used in turn until a matching key is found.  The "
+"supported methods are:\n"
+" Local\n"
+"   - Use the local keyring.\n"
+" Keyserver\n"
+"   - Use the default keyserver.\n"
+" PKA\n"
+"   - Use the Public Key Association.\n"
+" kDNS\n"
+"   - Use kDNS with the nameserver below.\n"
+" Custom\n"
+"   - Configured in the backend dialog.\n"
+msgstr ""
 
+#: src/settingsdlg.c:627
+msgid "Method:"
+msgstr ""
+
+#: src/settingsdlg.c:644
+msgid "The IP address of the nameserver used for the kDNS method."
+msgstr ""
+
+#: src/settingsdlg.c:646
+#, fuzzy
+msgid "kDNS Server:"
+msgstr "/_Sunucu"
+
+#: src/settingsdlg.c:740
+#, fuzzy
+msgid "The URL given for the keyserver is not valid."
+msgstr "Belittiðiniz anahtar sunucusu geçersiz"
+
+#: src/settingsdlg.c:749
+msgid "The data given for \"Auto key locate\" is not valid."
+msgstr ""
+
+#: src/settingsdlg.c:886
+#, fuzzy
+msgid "GNU Privacy Assistant - Settings"
+msgstr "GNU Gizlilik Asistaný - Anahtarlýk Düzenleyicisi"
+
 #: src/siglist.c:128
 msgid "Level"
 msgstr "Seviye"
 
-#: src/siglist.c:135
-msgid "Local"
-msgstr "Yerel"
-
 #: src/verifydlg.c:116
 #, fuzzy
 msgid "Verify documents"
@@ -2127,6 +1889,344 @@
 msgid "Signatures:"
 msgstr "Ýmzalar:"
 
+#~ msgid "/File/C_lear"
+#~ msgstr "/Dosya/_Temizle"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/Dosya/_Aç"
+
+#, fuzzy
+#~ msgid "/File/Save _As"
+#~ msgstr "/Dosya/_Kapat"
+
+#~ msgid "/File/sep1"
+#~ msgstr "/Dosya/bol1"
+
+#~ msgid "/File/_Sign"
+#~ msgstr "/Dosya/_Ýmzala"
+
+#~ msgid "/File/_Verify"
+#~ msgstr "/Dosya/_Doðrula"
+
+#~ msgid "/File/_Encrypt"
+#~ msgstr "/Dosya/_Þifrele"
+
+#~ msgid "/File/_Decrypt"
+#~ msgstr "/Dosya/Çö_z"
+
+#~ msgid "/File/sep2"
+#~ msgstr "/Dosya/bol2"
+
+#~ msgid "/File/_Close"
+#~ msgstr "/Dosya/_Kapat"
+
+#~ msgid "/File/_Quit"
+#~ msgstr "/Dosya/_Çýkýþ"
+
+#, fuzzy
+#~ msgid "/Edit/_Undo"
+#~ msgstr "/Düzen/_Kopyala"
+
+#, fuzzy
+#~ msgid "/Edit/_Redo"
+#~ msgstr "/Düzen/_Kopyala"
+
+#, fuzzy
+#~ msgid "/Edit/sep0"
+#~ msgstr "/Düzen/bol2"
+
+#, fuzzy
+#~ msgid "/Edit/Cut"
+#~ msgstr "/Düzen/Kopyala"
+
+#~ msgid "/Edit/_Copy"
+#~ msgstr "/Düzen/_Kopyala"
+
+#~ msgid "/Edit/_Paste"
+#~ msgstr "/Düzen/_Yapýþtýr"
+
+#, fuzzy
+#~ msgid "/Edit/_Delete"
+#~ msgstr "/Düzen/_Yapýþtýr"
+
+#~ msgid "/Edit/sep1"
+#~ msgstr "/Düzen/bol1"
+
+#~ msgid "/Edit/Select _All"
+#~ msgstr "/Düzen/_Tümünü Seç"
+
+#~ msgid "/Edit/sep2"
+#~ msgstr "/Düzen/bol2"
+
+#~ msgid "/Edit/Pr_eferences..."
+#~ msgstr "/Düzen/Te_rcihler..."
+
+#, fuzzy
+#~ msgid "/Edit/_Backend Preferences..."
+#~ msgstr "/Düzen/Te_rcihler..."
+
+#~ msgid "/_Windows"
+#~ msgstr "/_Pencereler"
+
+#~ msgid "/Windows/_Keyring Editor"
+#~ msgstr "/Pencereler/_Anahtarlýk Düzenleyicisi"
+
+#~ msgid "/Windows/_Filemanager"
+#~ msgstr "/Pencereler/_Dosya Yöneticisi"
+
+#~ msgid "/Edit/Copy"
+#~ msgstr "/Düzen/Kopyala"
+
+#, fuzzy
+#~ msgid "/Edit/Paste"
+#~ msgstr "/Düzen/_Yapýþtýr"
+
+#~ msgid "open file"
+#~ msgstr "dosyayý aç"
+
+#, fuzzy
+#~ msgid "save file as"
+#~ msgstr "dosyalarý kapat"
+
+#, fuzzy
+#~ msgid "cut the selection"
+#~ msgstr "Seçili dosyayý þifrele"
+
+#, fuzzy
+#~ msgid "copy the selection"
+#~ msgstr "Seçili dosyayý þifrele"
+
+#, fuzzy
+#~ msgid "Sign the selected text"
+#~ msgstr "Seçili anahtarý imzala"
+
+#, fuzzy
+#~ msgid "verify text"
+#~ msgstr "dosyayý doðrula"
+
+#, fuzzy
+#~ msgid "encrypt text"
+#~ msgstr "dosyayý þifrele"
+
+#, fuzzy
+#~ msgid "decrypt text"
+#~ msgstr "dosyayý çöz"
+
+#~ msgid "preferences"
+#~ msgstr "tercihler"
+
+#, fuzzy
+#~ msgid "Open the keyring editor"
+#~ msgstr "anahtarlýk düzenleyicisini aç (varsayýlan)"
+
+#, fuzzy
+#~ msgid "keyring editor"
+#~ msgstr "Anahtarlýk Düzenleyicisi"
+
+#, fuzzy
+#~ msgid "Open the file manager"
+#~ msgstr "Dosya Yöneticisini Aç"
+
+#~ msgid "file manager"
+#~ msgstr "dosya yöneticisi"
+
+#~ msgid "Help"
+#~ msgstr "Yardým"
+
+#~ msgid "help"
+#~ msgstr "yardým"
+
+#~ msgid "/File/Sign"
+#~ msgstr "/Dosya/Ýmzala"
+
+#~ msgid "/File/Verify"
+#~ msgstr "/Dosya/Doðrula"
+
+#~ msgid "/File/Encrypt"
+#~ msgstr "/Dosya/Þifrele"
+
+#~ msgid "/File/Decrypt"
+#~ msgstr "/Dosya/Çöz"
+
+#~ msgid "close files"
+#~ msgstr "dosyalarý kapat"
+
+#~ msgid "sign file"
+#~ msgstr "dosyayý imzala"
+
+#~ msgid "verify file"
+#~ msgstr "dosyayý doðrula"
+
+#~ msgid "encrypt file"
+#~ msgstr "dosyayý þifrele"
+
+#~ msgid "decrypt file"
+#~ msgstr "dosyayý çöz"
+
+#, fuzzy
+#~ msgid "Open the clipboard"
+#~ msgstr "Dosya Yöneticisini Aç"
+
+#~ msgid "_Backup to file:"
+#~ msgstr "Dosyaya _Yedekle"
+
+#~ msgid "B_rowse..."
+#~ msgstr "_Göz At"
+
+#, fuzzy
+#~ msgid "_Back"
+#~ msgstr "/_Yedekle..."
+
+#~ msgid "Brought to you by:"
+#~ msgstr "Size bunu saðlayan:"
+
+#, fuzzy
+#~ msgid "GPA is Free Software under the"
+#~ msgstr "GPA, GNU Genel Kamu Lisansý altýnda"
+
+#~ msgid "GNU General Public License."
+#~ msgstr "bir özgür yazýlýmdýr."
+
+#~ msgid "For news see:"
+#~ msgstr "Yenilikler için:"
+
+#, fuzzy
+#~ msgid "http://www.gpg4win.org"
+#~ msgstr "http://www.gnupg.org"
+
+#~ msgid "http://www.gnupg.org"
+#~ msgstr "http://www.gnupg.org"
+
+#, fuzzy
+#~ msgid "GNU General Public License"
+#~ msgstr "bir özgür yazýlýmdýr."
+
+#, fuzzy
+#~ msgid "_GNU General Public License"
+#~ msgstr "bir özgür yazýlýmdýr."
+
+#~ msgid "Show Help Text\n"
+#~ msgstr "Yardým Yazýsýný Göster\n"
+
+#~ msgid "/_Help"
+#~ msgstr "/_Yardým"
+
+#~ msgid "/Help/_Contents"
+#~ msgstr "/Yardým/_Ýçindekiler"
+
+#~ msgid "/Help/_License"
+#~ msgstr "/Yardým/_Lisans"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/Yardým/_Hakkýnda"
+
+#~ msgid "Please insert your name"
+#~ msgstr "Lütfen isminizi girin"
+
+#~ msgid "Please insert your email address"
+#~ msgstr "Lütfen email adresinizi girin"
+
+#, fuzzy
+#~ msgid "/Keys/sep0"
+#~ msgstr "/Anahtarlar/bol1"
+
+#~ msgid "/Keys/_Delete Keys..."
+#~ msgstr "/Anahtarlar/Anahtarlarý _Sil..."
+
+#~ msgid "/Keys/sep1"
+#~ msgstr "/Anahtarlar/bol1"
+
+#~ msgid "/Keys/_Sign Keys..."
+#~ msgstr "/Anahtarlar/Anahtarlarý Ý_mzala..."
+
+#~ msgid "/Keys/Set _Owner Trust..."
+#~ msgstr "/Anahtarlar/Sahibine _Güveni Belirle..."
+
+#~ msgid "/Keys/_Edit Private Key..."
+#~ msgstr "/Anahtarlar/Özel Anahtarý _Düzenle..."
+
+#~ msgid "/Keys/sep2"
+#~ msgstr "/Anahtarlar/bol2"
+
+#~ msgid "/Keys/_Import Keys..."
+#~ msgstr "/Anahtarlar/A_nahtarlarý Dýþarýdan Al..."
+
+#~ msgid "/Keys/E_xport Keys..."
+#~ msgstr "/Anahtarlar/Ana_htarlarý Yaz..."
+
+#~ msgid "/Keys/_Backup..."
+#~ msgstr "/Anahtarlar/Yed_ekle..."
+
+#~ msgid "/Server/_Send Keys..."
+#~ msgstr "/Sunucu/Anahtarlarý _Gönder..."
+
+#, fuzzy
+#~ msgid "/Windows/_File Manager"
+#~ msgstr "/Pencereler/_Dosya Yöneticisi"
+
+#~ msgid "/Keys/Export Keys..."
+#~ msgstr "/Anahtarlar/Anahtarlarý Dýþarý Yaz..."
+
+#~ msgid "/Keys/Delete Keys..."
+#~ msgstr "/Anahtarlar/Anahtarlarý Sil..."
+
+#~ msgid "/Server/Send Keys..."
+#~ msgstr "/Sunucu/Anahtarlarý Gönder..."
+
+#~ msgid "/Keys/Set Owner Trust..."
+#~ msgstr "/Anahtarlar/Sahibine Güveni Belirle..."
+
+#~ msgid "/Keys/Sign Keys..."
+#~ msgstr "/Anahtarlar/Anahtarlarý Ýmzala..."
+
+#~ msgid "/Keys/Edit Private Key..."
+#~ msgstr "/Anahtarlar/Özel Anahtarý Düzenle..."
+
+#~ msgid "/Keys/Backup..."
+#~ msgstr "/Anahtarlar/Yedekle..."
+
+#~ msgid "/_Copy"
+#~ msgstr "/_Kopyala"
+
+#~ msgid "/_Paste"
+#~ msgstr "/_Yapýþtýr"
+
+#~ msgid "/Set Owner Trust..."
+#~ msgstr "/Sahibine Güveni Belirle..."
+
+#~ msgid "/Sign Keys..."
+#~ msgstr "Anahtarlarý Ýmzala..."
+
+#~ msgid "/Edit Private Key..."
+#~ msgstr "Özel Anahtarý Düzenle..."
+
+#~ msgid "/Backup..."
+#~ msgstr "/Yedekle..."
+
+#~ msgid "edit key"
+#~ msgstr "anahtarý düzenle"
+
+#~ msgid "remove key"
+#~ msgstr "anahtarý kaldýr"
+
+#~ msgid "sign key"
+#~ msgstr "anahtarý imzala"
+
+#~ msgid "import keys"
+#~ msgstr "anahtarlarý dýþarýdan al"
+
+#~ msgid "export keys"
+#~ msgstr "anahtarlarý dýþarý yaz"
+
+#~ msgid "brief"
+#~ msgstr "özet"
+
+#~ msgid "detailed"
+#~ msgstr "detaylý"
+
+#~ msgid "Settings"
+#~ msgstr "Ayarlar"
+
 #~ msgid "Sign files"
 #~ msgstr "Dosyalarý imzala"
 

Modified: trunk/po/zh_TW.Big5.po
===================================================================
--- trunk/po/zh_TW.Big5.po	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/po/zh_TW.Big5.po	2008-05-08 12:53:41 UTC (rev 891)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gpa-0.7.0\n"
 "Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2008-03-12 12:29+0100\n"
+"POT-Creation-Date: 2008-05-08 14:51+0200\n"
 "PO-Revision-Date: 2003-10-20 11:55+0200\n"
 "Last-Translator: Shell Hung <shell at linux.org.hk>\n"
 "Language-Team: Hong Kong Linux User Group <info at linux.org.hk>\n"
@@ -14,425 +14,212 @@
 "Content-Type: text/plain; charset=big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/clipboard.c:367 src/fileman.c:350
+#: src/clipboard.c:376 src/fileman.c:392
 msgid "Open File"
 msgstr "¶}±ÒÀÉ®×"
 
-#: src/clipboard.c:395 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:404 src/confdialog.c:1267 src/gtktools.c:82
 msgid "GPA Message"
 msgstr "GPA °T®§"
 
 #. TRANSLATORS: The arguments are the filename, the integer size
 #. and the unit (such as KB or MB).
-#: src/clipboard.c:412
+#: src/clipboard.c:421
 #, fuzzy, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
 msgstr ""
 "ÀÉ®× %s ¤w¸g¦s¦b.\n"
 "n¶i¦æÂÐ¼g¶Ü?"
 
-#: src/clipboard.c:481
+#: src/clipboard.c:542
 msgid "Save As..."
 msgstr ""
 
-#: src/clipboard.c:522 src/clipboard.c:552 src/clipboard.c:582
-#: src/clipboard.c:612 src/clipboard.c:1113 src/fileman.c:675
-#: src/keyring.c:1657
+#: src/clipboard.c:583 src/clipboard.c:613 src/clipboard.c:643
+#: src/clipboard.c:673 src/clipboard.c:1034
 msgid "Clipboard"
 msgstr ""
 
-#: src/clipboard.c:692 src/fileman.c:472 src/keyring.c:863
-msgid "/_File"
+#: src/clipboard.c:755 src/fileman.c:515 src/keyring.c:884
+#, fuzzy
+msgid "_File"
 msgstr "/ÀÉ®×"
 
-#: src/clipboard.c:693 src/fileman.c:474
-msgid "/File/C_lear"
-msgstr "/ÀÉ®×/²M°£ (&C)"
-
-#: src/clipboard.c:694 src/fileman.c:473
-msgid "/File/_Open"
-msgstr "/ÀÉ®×/¶}±Ò (&O)"
-
-#: src/clipboard.c:695
+#: src/clipboard.c:756 src/fileman.c:516 src/keyring.c:885
 #, fuzzy
-msgid "/File/Save _As"
-msgstr "/ÀÉ®×/Ãö³¬ (&C)"
-
-#: src/clipboard.c:697 src/fileman.c:475
-msgid "/File/sep1"
-msgstr "/ÀÉ®×/sep1"
-
-#: src/clipboard.c:698 src/fileman.c:476
-msgid "/File/_Sign"
-msgstr "/ÀÉ®×/Ã±¸p (&S)"
-
-#: src/clipboard.c:699 src/fileman.c:477
-msgid "/File/_Verify"
-msgstr "/ÀÉ®×/ÅçÃÒ (&V)"
-
-#: src/clipboard.c:700 src/fileman.c:478
-msgid "/File/_Encrypt"
-msgstr "/ÀÉ®×/¥[±K (&E)"
-
-#: src/clipboard.c:701 src/fileman.c:479
-msgid "/File/_Decrypt"
-msgstr "/ÀÉ®×/¸Ñ±K (&D)"
-
-#: src/clipboard.c:702 src/fileman.c:480
-msgid "/File/sep2"
-msgstr "/ÀÉ®×/sep2"
-
-#: src/clipboard.c:703 src/fileman.c:481 src/keyring.c:864
-msgid "/File/_Close"
-msgstr "/ÀÉ®×/Ãö³¬ (&C)"
-
-#: src/clipboard.c:704 src/fileman.c:482 src/keyring.c:866
-msgid "/File/_Quit"
-msgstr "/ÀÉ®×/Â÷¶} (&Q)"
-
-#: src/clipboard.c:707 src/fileman.c:485 src/keyring.c:869
-msgid "/_Edit"
+msgid "_Edit"
 msgstr "/½s¿è"
 
-#: src/clipboard.c:710
-#, fuzzy
-msgid "/Edit/_Undo"
-msgstr "/½s¿è/½Æ»s (&C)"
-
-#: src/clipboard.c:711
-#, fuzzy
-msgid "/Edit/_Redo"
-msgstr "/½s¿è/½Æ»s (&C)"
-
-#: src/clipboard.c:712
-#, fuzzy
-msgid "/Edit/sep0"
-msgstr "/½s¿è/sep2"
-
-#: src/clipboard.c:714 src/clipboard.c:750
-#, fuzzy
-msgid "/Edit/Cut"
-msgstr "/½s¿è/½Æ»s"
-
-#: src/clipboard.c:715 src/keyring.c:870
-msgid "/Edit/_Copy"
-msgstr "/½s¿è/½Æ»s (&C)"
-
-#: src/clipboard.c:716 src/keyring.c:872
-msgid "/Edit/_Paste"
-msgstr "/½s¿è/¶K¤W (&P)"
-
-#: src/clipboard.c:717
-#, fuzzy
-msgid "/Edit/_Delete"
-msgstr "/½s¿è/¶K¤W (&P)"
-
-#: src/clipboard.c:718 src/keyring.c:874
-msgid "/Edit/sep1"
-msgstr "/½s¿è/sep1"
-
-#: src/clipboard.c:719 src/fileman.c:486 src/keyring.c:875
-msgid "/Edit/Select _All"
-msgstr "/½s¿è/¥þ³¡¿ï¾Ü (&A)"
-
-#: src/clipboard.c:721 src/fileman.c:487 src/keyring.c:876
-msgid "/Edit/sep2"
-msgstr "/½s¿è/sep2"
-
-#: src/clipboard.c:722 src/fileman.c:488 src/keyring.c:877
-msgid "/Edit/Pr_eferences..."
-msgstr "/½s¿è/³]©w (&E)"
-
-#: src/clipboard.c:724 src/fileman.c:490 src/keyring.c:879
-#, fuzzy
-msgid "/Edit/_Backend Preferences..."
-msgstr "/½s¿è/³]©w (&E)"
-
-#: src/clipboard.c:728 src/fileman.c:494 src/keyring.c:906
-msgid "/_Windows"
-msgstr "/µøµ¡"
-
-#: src/clipboard.c:729 src/fileman.c:495 src/keyring.c:907
-msgid "/Windows/_Keyring Editor"
-msgstr "/µøµ¡/Æ_°é½s¿è¾¹ (&K)"
-
-#: src/clipboard.c:730 src/fileman.c:496
-msgid "/Windows/_Filemanager"
-msgstr "/µøµ¡/ÀÉ®×ºÞ²z (&F)"
-
-#: src/clipboard.c:731 src/fileman.c:497 src/keyring.c:909
-#, fuzzy
-msgid "/Windows/_Clipboard"
-msgstr "/µøµ¡/ÀÉ®×ºÞ²z (&F)"
-
-#: src/clipboard.c:758 src/keyring.c:948
-msgid "/Edit/Copy"
-msgstr "/½s¿è/½Æ»s"
-
-#: src/clipboard.c:766
-#, fuzzy
-msgid "/Edit/Delete"
-msgstr "/½s¿è/¥þ³¡¿ï¾Ü (&A)"
-
-#: src/clipboard.c:774
-#, fuzzy
-msgid "/Edit/Paste"
-msgstr "/½s¿è/¶K¤W (&P)"
-
-#: src/clipboard.c:879
+#: src/clipboard.c:760
 msgid "Clear buffer"
 msgstr ""
 
-#: src/clipboard.c:879
-msgid "clear buffer"
-msgstr ""
-
-#: src/clipboard.c:887 src/fileman.c:602
+#: src/clipboard.c:762 src/fileman.c:520
 msgid "Open a file"
 msgstr "¶}±ÒÀÉ®×"
 
-#: src/clipboard.c:887 src/fileman.c:602
-msgid "open file"
-msgstr "¶}±ÒÀÉ®×"
-
-#: src/clipboard.c:892
+#: src/clipboard.c:764
 #, fuzzy
 msgid "Save to a file"
 msgstr "¶}±ÒÀÉ®×"
 
-#: src/clipboard.c:892
+#: src/clipboard.c:766
 #, fuzzy
-msgid "save file as"
-msgstr "Ãö³¬ÀÉ®×"
+msgid "Sign buffer text"
+msgstr "Ã±¸p±KÆ_"
 
-#: src/clipboard.c:900
+#: src/clipboard.c:768
 #, fuzzy
-msgid "Cut the selection"
-msgstr "¥[±K¤w¿ï¾ÜÀÉ®×"
+msgid "Check signatures of buffer text"
+msgstr "ÀË¬d¤w¿ï¾ÜÀÉ®×ªºÃ±¸p"
 
-#: src/clipboard.c:901
+#: src/clipboard.c:770
 #, fuzzy
-msgid "cut the selection"
+msgid "Encrypt the buffer text"
 msgstr "¥[±K¤w¿ï¾ÜÀÉ®×"
 
-#: src/clipboard.c:907
+#: src/clipboard.c:772
 #, fuzzy
-msgid "Copy the selection"
-msgstr "¥[±K¤w¿ï¾ÜÀÉ®×"
+msgid "Decrypt the buffer text"
+msgstr "¸Ñ±K¤w¿ï¾ÜÀÉ®×"
 
-#: src/clipboard.c:908
-#, fuzzy
-msgid "copy the selection"
-msgstr "¥[±K¤w¿ï¾ÜÀÉ®×"
-
-#: src/clipboard.c:914
-msgid "Paste the clipboard"
+#: src/clipboard.c:774
+msgid "Close the buffer"
 msgstr ""
 
-#: src/clipboard.c:915
-msgid "paste the clipboard"
+#: src/clipboard.c:776 src/fileman.c:534 src/keyring.c:893
+msgid "Quit the program"
 msgstr ""
 
-#: src/clipboard.c:925 src/fileman.c:612 src/keyring.c:1570
-msgid "Sign"
-msgstr "Ã±¸p"
-
-#: src/clipboard.c:926
+#: src/clipboard.c:782
 #, fuzzy
-msgid "Sign the selected text"
-msgstr "Ã±¸p¤w¿ï¾Üªº±KÆ_"
+msgid "Undo the last action"
+msgstr "¥[±K¤w¿ï¾ÜÀÉ®×"
 
-#: src/clipboard.c:927
-#, fuzzy
-msgid "sign text"
-msgstr "Ã±¸p±KÆ_"
+#: src/clipboard.c:784
+msgid "Redo the last undone action"
+msgstr ""
 
-#: src/clipboard.c:935 src/fileman.c:623
-msgid "Verify"
-msgstr "ÅçÃÒ"
-
-#: src/clipboard.c:936
+#: src/clipboard.c:787
 #, fuzzy
-msgid "Check signatures of selected text"
-msgstr "ÀË¬d¤w¿ï¾ÜÀÉ®×ªºÃ±¸p"
+msgid "Cut the selection"
+msgstr "¥[±K¤w¿ï¾ÜÀÉ®×"
 
-#: src/clipboard.c:937
+#: src/clipboard.c:789 src/keyring.c:897
 #, fuzzy
-msgid "verify text"
-msgstr "ÅçÃÒÀÉ®×"
-
-#: src/clipboard.c:945 src/fileman.c:634
-msgid "Encrypt"
-msgstr "¥[±K"
-
-#: src/clipboard.c:946
-#, fuzzy
-msgid "Encrypt the selected text"
+msgid "Copy the selection"
 msgstr "¥[±K¤w¿ï¾ÜÀÉ®×"
 
-#: src/clipboard.c:947
-#, fuzzy
-msgid "encrypt text"
-msgstr "¥[±KÀÉ®×"
+#: src/clipboard.c:791 src/keyring.c:899
+msgid "Paste the clipboard"
+msgstr ""
 
-#: src/clipboard.c:955 src/fileman.c:645
-msgid "Decrypt"
-msgstr "¸Ñ±K"
-
-#: src/clipboard.c:956
+#: src/clipboard.c:793
 #, fuzzy
-msgid "Decrypt the selected text"
+msgid "Delete the selected text"
 msgstr "¸Ñ±K¤w¿ï¾ÜÀÉ®×"
 
-#: src/clipboard.c:957
-#, fuzzy
-msgid "decrypt text"
-msgstr "¸Ñ±KÀÉ®×"
+#: src/clipboard.c:795
+msgid "Select the entire document"
+msgstr ""
 
-#: src/clipboard.c:967 src/fileman.c:658 src/keyring.c:1631
+#: src/clipboard.c:902 src/fileman.c:625
 #, fuzzy
-msgid "Open the preferences dialog"
-msgstr "¶}±Ò³]©wµøµ¡"
-
-#: src/clipboard.c:968 src/fileman.c:659 src/keyring.c:1632
-msgid "preferences"
-msgstr "³]©w"
-
-#: src/clipboard.c:975 src/fileman.c:666
-#, fuzzy
 msgid "Keyring"
 msgstr "Æ_°é½s¿è¾¹"
 
-#: src/clipboard.c:976 src/fileman.c:667
-#, fuzzy
-msgid "Open the keyring editor"
-msgstr "¶}±ÒÆ_°é½s¿è¾¹ (¹w³])"
-
-#: src/clipboard.c:977 src/fileman.c:668
-#, fuzzy
-msgid "keyring editor"
-msgstr "Æ_°é½s¿è¾¹"
-
-#: src/clipboard.c:983 src/keyring.c:1648
+#: src/clipboard.c:904 src/keyring.c:1073
 msgid "Files"
 msgstr "ÀÉ®×"
 
-#: src/clipboard.c:984 src/keyring.c:1649
+#: src/clipboard.c:1004
 #, fuzzy
-msgid "Open the file manager"
-msgstr "¶}±ÒÀÉ®×ºÞ²zû"
-
-#: src/clipboard.c:985 src/keyring.c:1650
-msgid "file manager"
-msgstr "ÀÉ®×ºÞ²zû"
-
-#: src/clipboard.c:992 src/fileman.c:684 src/keyring.c:1665
-msgid "Help"
-msgstr "¨D§U"
-
-#: src/clipboard.c:993 src/fileman.c:685 src/keyring.c:1666
-msgid "Understanding the GNU Privacy Assistant"
-msgstr "¤F¸ÑGNU Privacy Assistant"
-
-#: src/clipboard.c:994 src/fileman.c:686 src/keyring.c:1667
-msgid "help"
-msgstr "¨D§U"
-
-#: src/clipboard.c:1084
-#, fuzzy
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Privacy Assistant - ÀÉ®×ºÞ²z"
 
-#: src/confdialog.c:993
+#: src/confdialog.c:994
 msgid "<b>Main</b>"
 msgstr ""
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default values"
 msgstr ""
 
-#: src/confdialog.c:1143
+#: src/confdialog.c:1144
 msgid "Use default value"
 msgstr ""
 
-#: src/confdialog.c:1146
+#: src/confdialog.c:1147
 msgid "Do not use option"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom values"
 msgstr ""
 
-#: src/confdialog.c:1151
+#: src/confdialog.c:1152
 msgid "Use custom value"
 msgstr ""
 
-#: src/confdialog.c:1155
+#: src/confdialog.c:1156
 msgid "Use default argument"
 msgstr ""
 
-#: src/confdialog.c:1280
+#: src/confdialog.c:1281
 msgid ""
 "There are unapplied changes by you. Changing the expert setting will apply "
 "those changes.  Do you want to continue?"
 msgstr ""
 
-#: src/confdialog.c:1325
+#: src/confdialog.c:1326
 msgid "Crypto Backend Configuration"
 msgstr ""
 
-#: src/confdialog.c:1334
+#: src/confdialog.c:1332
 msgid "Reset"
 msgstr ""
 
-#: src/confdialog.c:1346
+#: src/confdialog.c:1351
 msgid "Configure the tools of the GnuPG system."
 msgstr ""
 
-#: src/confdialog.c:1350
+#: src/confdialog.c:1355
 #, fuzzy
 msgid "Level:"
 msgstr "µ{«×"
 
-#: src/confdialog.c:1359
+#: src/confdialog.c:1364
 #, fuzzy
 msgid "Basic"
 msgstr "/³Æ¥÷... (&B)"
 
-#: src/confdialog.c:1360
+#: src/confdialog.c:1365
 msgid "Advanced"
 msgstr ""
 
-#: src/confdialog.c:1361
+#: src/confdialog.c:1366
 #, fuzzy
 msgid "Expert"
 msgstr "¿é¥X"
 
-#: src/encryptdlg.c:142 src/expirydlg.c:116 src/filesigndlg.c:133
-#: src/gpabackupop.c:292 src/gpaprogressdlg.c:146 src/gparecvkeydlg.c:96
-#: src/gpawizard.c:289 src/gpgmetools.c:696 src/keygendlg.c:149
-#: src/ownertrustdlg.c:111 src/passwddlg.c:100
-msgid "_Cancel"
-msgstr ""
-
-#: src/encryptdlg.c:143
+#: src/encryptdlg.c:139
 #, fuzzy
 msgid "Encrypt documents"
 msgstr "¥[±KÀÉ®×"
 
-#: src/encryptdlg.c:174
+#: src/encryptdlg.c:156
 msgid "_Public Keys"
 msgstr "¤½Æ_ (&P)"
 
-#: src/encryptdlg.c:177
+#: src/encryptdlg.c:179 src/icons.c:198
 msgid "_Sign"
 msgstr "Ã±¸p (&S)"
 
-#: src/encryptdlg.c:201 src/filesigndlg.c:185
+#: src/encryptdlg.c:185
 msgid "Sign _as "
 msgstr "Ã±¸p¬° (&a)"
 
-#: src/encryptdlg.c:215 src/filesigndlg.c:187
+#: src/encryptdlg.c:215 src/filesigndlg.c:227
 msgid "A_rmor"
 msgstr "¯Â¤å¦r (&r)"
 
@@ -440,147 +227,100 @@
 msgid "Please provide a correct date."
 msgstr "½Ð´£¨Ñ¥¿½T¤é´Á"
 
-#: src/expirydlg.c:111
+#: src/expirydlg.c:108
 msgid "Change expiry date"
 msgstr "§ó§ï¦³®Ä¤é´Á"
 
-#: src/expirydlg.c:129
+#: src/expirydlg.c:113 src/gpaprogressdlg.c:138
+msgid "_Cancel"
+msgstr ""
+
+#: src/expirydlg.c:124
 msgid "_never expire"
 msgstr "¥Ã»·¥Í®Ä (&n)"
 
-#: src/expirydlg.c:134
+#: src/expirydlg.c:129
 msgid "_expire on:"
 msgstr "¥¢®Ä´Á¬° (&e)"
 
-#: src/fileman.c:355 src/fileman.c:953
-msgid "The file is already open."
-msgstr "³oÓÀÉ®×¤w¸g¶}±Ò."
-
-#: src/fileman.c:516
-msgid "/File/Sign"
-msgstr "/ÀÉ®×/Ã±¸p"
-
-#: src/fileman.c:521
-msgid "/File/Verify"
-msgstr "/ÀÉ®×/ÅçÃÒ"
-
-#: src/fileman.c:526
-msgid "/File/Encrypt"
-msgstr "/ÀÉ®×/¥[±K"
-
-#: src/fileman.c:531
-msgid "/File/Decrypt"
-msgstr "/ÀÉ®×/¸Ñ±K"
-
-#: src/fileman.c:606
+#: src/fileman.c:522
 msgid "Close all files"
 msgstr "Ãö³¬©Ò¦³ÀÉ®×"
 
-#: src/fileman.c:606
-msgid "close files"
-msgstr "Ãö³¬ÀÉ®×"
-
-#: src/fileman.c:613
+#: src/fileman.c:524
 msgid "Sign the selected file"
 msgstr "Ã±¸p¤w¿ï¾ÜÀÉ®×"
 
-#: src/fileman.c:614
-msgid "sign file"
-msgstr "ÀÉ®×Ã±¸p"
-
-#: src/fileman.c:624
+#: src/fileman.c:526
 msgid "Check signatures of selected file"
 msgstr "ÀË¬d¤w¿ï¾ÜÀÉ®×ªºÃ±¸p"
 
-#: src/fileman.c:625
-msgid "verify file"
-msgstr "ÅçÃÒÀÉ®×"
-
-#: src/fileman.c:635
+#: src/fileman.c:528
 msgid "Encrypt the selected file"
 msgstr "¥[±K¤w¿ï¾ÜÀÉ®×"
 
-#: src/fileman.c:636
-msgid "encrypt file"
-msgstr "¥[±KÀÉ®×"
-
-#: src/fileman.c:646
+#: src/fileman.c:530
 msgid "Decrypt the selected file"
 msgstr "¸Ñ±K¤w¿ï¾ÜÀÉ®×"
 
-#: src/fileman.c:647
-msgid "decrypt file"
-msgstr "¸Ñ±KÀÉ®×"
+#: src/fileman.c:532
+msgid "Close the window"
+msgstr ""
 
-#: src/fileman.c:676 src/keyring.c:1658
+#: src/fileman.c:538
 #, fuzzy
-msgid "Open the clipboard"
-msgstr "¶}±ÒÀÉ®×ºÞ²zû"
+msgid "Select all files"
+msgstr "Ãö³¬©Ò¦³ÀÉ®×"
 
-#: src/fileman.c:677 src/keyring.c:1659
-msgid "clipboard"
-msgstr ""
-
-#: src/fileman.c:785
+#: src/fileman.c:731
 msgid "File"
 msgstr "ÀÉ®×"
 
-#: src/fileman.c:850
+#: src/fileman.c:796
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - ÀÉ®×ºÞ²z"
 
-#: src/fileman.c:876
+#: src/fileman.c:819
 #, fuzzy
 msgid "File Manager"
 msgstr "ÀÉ®×ºÞ²zû"
 
-#: src/filesigndlg.c:134
+#: src/fileman.c:895
+msgid "The file is already open."
+msgstr "³oÓÀÉ®×¤w¸g¶}±Ò."
+
+#: src/filesigndlg.c:171
 msgid "Sign documents"
 msgstr ""
 
-#: src/filesigndlg.c:144
-msgid "Signing Mode"
+#: src/filesigndlg.c:180
+#, fuzzy
+msgid "<b>Sign _as</b>"
+msgstr "Ã±¸p¬° (&a)"
+
+#: src/filesigndlg.c:201
+#, fuzzy
+msgid "<b>Signing Mode</b>"
 msgstr "Ã±¸p¤¤"
 
-#: src/filesigndlg.c:152
-msgid "si_gn and compress"
+#: src/filesigndlg.c:211
+#, fuzzy
+msgid "Si_gn and compress"
 msgstr "Ã±¸p¤ÎÀ£ÁY (&g)"
 
-#: src/filesigndlg.c:158
-msgid "_cleartext signature"
+#: src/filesigndlg.c:217
+#, fuzzy
+msgid "Clear_text signature"
 msgstr "¯Â¤å¦rÃ±¸p (&C)"
 
-#: src/filesigndlg.c:165
+#: src/filesigndlg.c:223
 #, fuzzy
-msgid "_detached signature"
+msgid "_Detached signature"
 msgstr "¯Â¤å¦rÃ±¸p (&C)"
 
-#: src/gpabackupop.c:213 src/gpgmetools.c:138
+#: src/gpabackupop.c:208
 #, c-format
 msgid ""
-"The file %s already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"ÀÉ®× %s ¤w¸g¦s¦b.\n"
-"n¶i¦æÂÐ¼g¶Ü?"
-
-#: src/gpabackupop.c:216 src/gpaexportserverop.c:134
-#: src/gpafileencryptop.c:455 src/gpafileverifyop.c:178 src/gpgmetools.c:141
-#: src/keydeletedlg.c:44 src/keydeletedlg.c:93 src/keysigndlg.c:62
-#: src/settingsdlg.c:165
-msgid "_Yes"
-msgstr "¬O (&Y)"
-
-#: src/gpabackupop.c:217 src/gpaexportserverop.c:135
-#: src/gpafileencryptop.c:456 src/gpafileverifyop.c:179 src/gpgmetools.c:142
-#: src/keydeletedlg.c:46 src/keydeletedlg.c:95 src/keysigndlg.c:64
-#: src/settingsdlg.c:168
-msgid "_No"
-msgstr "§_ (&N)"
-
-#: src/gpabackupop.c:229
-#, c-format
-msgid ""
 "A copy of your secret key has been made to the file:\n"
 "\n"
 "\t\"%s\"\n"
@@ -595,31 +335,19 @@
 "½Ð¤p¤ß«O¦s³oÓÀÉ®×\n"
 "(¨Ò¦p, Àx¦s¦bºÏºÐ¤ù¤¤¨Ã©ñ¦b¦w¥þ¦a¤è¤¤¦w¸m)."
 
-#: src/gpabackupop.c:244
+#: src/gpabackupop.c:223
 msgid "An error ocurred during the backup operation."
 msgstr ""
 
-#: src/gpabackupop.c:260
+#: src/gpabackupop.c:245
 msgid "Backup key to file"
 msgstr "³Æ¥÷±KÆ_¨ìÀÉ®×"
 
-#: src/gpabackupop.c:287
-msgid "Backup Keys"
-msgstr "³Æ¥÷±KÆ_"
-
-#: src/gpabackupop.c:311
+#: src/gpabackupop.c:255
 #, c-format
 msgid "Generating backup of key: %s"
 msgstr "¥¿¦b«Ø¥ß %s ªº³Æ¥÷"
 
-#: src/gpabackupop.c:317
-msgid "_Backup to file:"
-msgstr "¿é¥X¦ÜÀÉ®× (&B):"
-
-#: src/gpabackupop.c:329
-msgid "B_rowse..."
-msgstr "ÂsÄý (&r)"
-
 #: src/gpa.c:92
 #, fuzzy
 msgid "Output version information and exit"
@@ -640,26 +368,31 @@
 msgstr ""
 
 #: src/gpa.c:100
-msgid "Start only the UI server (implies --cms)"
+#, fuzzy
+msgid "Open the settings dialog"
+msgstr "¶}±Ò³]©wµøµ¡"
+
+#: src/gpa.c:102
+msgid "Enable the UI server (implies --cms)"
 msgstr ""
 
-#: src/gpa.c:102
+#: src/gpa.c:104
 #, fuzzy
 msgid "Read options from file"
 msgstr "¥ÑÀÉ®×¤¤Åª¨ú¿ï¶µ"
 
-#: src/gpa.c:293
+#: src/gpa.c:286
 msgid "[FILE...]"
 msgstr ""
 
-#: src/gpa.c:295
+#: src/gpa.c:288
 #, fuzzy
 msgid "Graphical frontend to GnuPG"
 msgstr ""
 "»yªk: gpa [¿ï¶µ]\n"
 "GnuPGªº¹Ï¹³¤¶±\n"
 
-#: src/gpa.c:296
+#: src/gpa.c:289
 msgid "Please report bugs to <"
 msgstr "¦^³ø¯äÂÎ¦Ü <"
 
@@ -667,15 +400,15 @@
 msgid "The keys have been copied to the clipboard."
 msgstr "¤½Æ_¤w½Æ¨î¨ì°Å¶KÃ¯¤º."
 
-#: src/gpaexportfileop.c:133
+#: src/gpaexportfileop.c:139
 msgid "Export public keys to file"
 msgstr "¿é¥X¤½Æ_¬°ÀÉ®×"
 
-#: src/gpaexportfileop.c:137
+#: src/gpaexportfileop.c:150
 msgid "_armor"
 msgstr "¯Â¤å¦r (&r)"
 
-#: src/gpaexportfileop.c:171
+#: src/gpaexportfileop.c:182
 #, c-format
 msgid "The keys have been exported to %s."
 msgstr "±KÆ_¤w³Q¶×¥X¨ì %s."
@@ -691,6 +424,18 @@
 "(\"%s\")¤¤.\n"
 "n½T©wµo©ñ³o¨Ç¤½Æ_¶Ü ?"
 
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:459
+#: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
+#: src/keydeletedlg.c:93 src/keysigndlg.c:61
+msgid "_Yes"
+msgstr "¬O (&Y)"
+
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:460
+#: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
+#: src/keydeletedlg.c:95 src/keysigndlg.c:63
+msgid "_No"
+msgstr "§_ (&N)"
+
 #: src/gpaexportserverop.c:187
 msgid "The keys have been sent to the server."
 msgstr "¤½Æ_¤w³Q¶Ç¨ì¤½Æ_§FªA¾¹."
@@ -699,29 +444,29 @@
 msgid "Decrypting..."
 msgstr "¸Ñ±K¤¤..."
 
-#: src/gpafiledecryptop.c:358 src/gpafileverifyop.c:449
+#: src/gpafiledecryptop.c:367 src/gpafileverifyop.c:464
 #, fuzzy, c-format
 msgid "\"%s\" contained no OpenPGP data."
 msgstr "ÀÉ®× \"%s\" ¨S¦³¥¿½Tªº OpenPGP ¸ê®Æ."
 
-#: src/gpafiledecryptop.c:359 src/gpafileverifyop.c:450
+#: src/gpafiledecryptop.c:368 src/gpafileverifyop.c:465
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no OpenPGPdata."
 msgstr "ÀÉ®× \"%s\" ¨S¦³¥¿½Tªº OpenPGP ¸ê®Æ."
 
-#: src/gpafiledecryptop.c:369
+#: src/gpafiledecryptop.c:378
 #, fuzzy, c-format
 msgid "\"%s\" contained no valid encrypted data."
 msgstr "ÀÉ®× \"%s\" ¨S¦³¥¿½Tªº¥[±K¸ê®Æ."
 
-#: src/gpafiledecryptop.c:371
+#: src/gpafiledecryptop.c:380
 #, fuzzy, c-format
 msgid "The file \"%s\" contained no validencrypted data."
 msgstr "ÀÉ®× \"%s\" ¨S¦³¥¿½Tªº¥[±K¸ê®Æ."
 
-#: src/gpafiledecryptop.c:380 src/gpafileencryptop.c:727
-#: src/gpafilesignop.c:510 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
-#: src/gpakeypasswdop.c:197 src/gpakeysignop.c:229
+#: src/gpafiledecryptop.c:389 src/gpafileencryptop.c:751
+#: src/gpafilesignop.c:525 src/gpafileverifyop.c:475 src/gpakeyexpireop.c:240
+#: src/gpakeypasswdop.c:209 src/gpakeysignop.c:237
 msgid "Wrong passphrase!"
 msgstr "±K½X¿ù»~!"
 
@@ -729,61 +474,60 @@
 msgid "Encrypting..."
 msgstr "¥[±K¤¤..."
 
-#: src/gpafileencryptop.c:453 src/verifydlg.c:222
+#: src/gpafileencryptop.c:457 src/verifydlg.c:222
 msgid "Unknown Key"
 msgstr "¥¼ª¾ªº¤½Æ_"
 
-#: src/gpafileencryptop.c:469
+#: src/gpafileencryptop.c:473
 #, fuzzy
 msgid "You are going to encrypt a document using the following key:"
 msgstr "±z¥¿¨Ï¥Î¥H¤Uªº±KÆ_¥[±K³oÓÀÉ®×:"
 
-#: src/gpafileencryptop.c:475
+#: src/gpafileencryptop.c:479
 msgid "However, it is not certain that the key belongs to that person."
 msgstr "¤£¹L, ±KÆ_¨Ã¤£ÄÝ©ó¹ï¤èªº"
 
-#: src/gpafileencryptop.c:481
+#: src/gpafileencryptop.c:485
 msgid "Do you <b>really</b> want to use this key?"
 msgstr "±z½T©wn¨Ï¥Î³oÓ±KÆ_ ?"
 
-#: src/gpafileencryptop.c:502 src/gpafileencryptop.c:542 src/verifydlg.c:227
+#: src/gpafileencryptop.c:506 src/gpafileencryptop.c:546 src/verifydlg.c:227
 msgid "Revoked Key"
 msgstr "²¾°£±KÆ_"
 
-#: src/gpafileencryptop.c:504 src/gpafileencryptop.c:544 src/gpawizard.c:281
-#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:422
-#: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
+#: src/gpafileencryptop.c:508 src/gpafileencryptop.c:548 src/gtktools.c:52
+#: src/gtktools.c:86 src/keyeditdlg.c:149 src/verifydlg.c:115
 msgid "_Close"
 msgstr "Ãö³¬ (&C)"
 
-#: src/gpafileencryptop.c:517
+#: src/gpafileencryptop.c:521
 msgid "The following key has been revoked by it's owner:"
 msgstr "³o¤½Æ_¤w³Q¹ï¤è¨ú®ø¤F:"
 
-#: src/gpafileencryptop.c:522 src/gpafileencryptop.c:565
+#: src/gpafileencryptop.c:526 src/gpafileencryptop.c:569
 msgid "And can not be used for encryption."
 msgstr "¦Ó¥B¤£¥i¥H¨Ï¥Î§@¬°¥[±K¤§¥Î."
 
-#: src/gpafileencryptop.c:557
+#: src/gpafileencryptop.c:561
 #, c-format
 msgid "The following key expired on %s:"
 msgstr "³o±KÆ_·|¦b %s ¥¢®Ä :"
 
-#: src/gpafileencryptop.c:641 src/gpafilesignop.c:414
+#: src/gpafileencryptop.c:600 src/gpafilesignop.c:448
+msgid ""
+"The selected certificates are not all of the same type. That is, you mixed "
+"OpenPGP and X.509 certificates. Please make sure to select only certificates "
+"of the same type."
+msgstr ""
+
+#: src/gpafileencryptop.c:675 src/gpafilesignop.c:434
 msgid "You didn't select any key for signing"
 msgstr "¨S¦³¿ï¾ÜÃ±¸pªºÀÉ®×"
 
-#: src/gpafilesignop.c:148
+#: src/gpafilesignop.c:157
 msgid "Signing..."
 msgstr "Ã±¸p¤¤..."
 
-#: src/gpafilesignop.c:428
-msgid ""
-"The selected certificates are not all of the same type. That is, you mixed "
-"OpenPGP and X.509 certificates. Please make sure to select only certificates "
-"of the same type."
-msgstr ""
-
 #: src/gpafileverifyop.c:101
 msgid "Verifying..."
 msgstr "ÅçÃÒ¤¤..."
@@ -801,15 +545,15 @@
 msgid "Generating Key..."
 msgstr "«Ø¥ß·sÆ_..."
 
-#: src/gpaimportfileop.c:131
+#: src/gpaimportfileop.c:132
 msgid "Import public keys from file"
 msgstr "¥ÑÀÉ®×¤¤¶×¤J¤½Æ_"
 
-#: src/gpaimportop.c:197
+#: src/gpaimportop.c:196
 msgid "No keys were found."
 msgstr "§ä¤£¨ì±KÆ_."
 
-#: src/gpaimportop.c:205
+#: src/gpaimportop.c:204
 #, c-format
 msgid ""
 "%i public keys read\n"
@@ -826,35 +570,35 @@
 "%i ¨pÆ_¤w¶×¤J\n"
 "%i ¨pÆ_¤w¶×¤J"
 
-#: src/gpakeyexpireop.c:239
+#: src/gpakeyexpireop.c:244
 msgid ""
 "Invalid time given.\n"
 "(you may not set the expiration time to the past.)"
 msgstr ""
 
-#: src/gpakeyselector.c:86 src/keylist.c:567 src/siglist.c:94
+#: src/gpakeyselector.c:86 src/keylist.c:555 src/siglist.c:94
 #: src/siglist.c:114 src/verifydlg.c:324
 msgid "Key ID"
 msgstr "±KÆ_ID"
 
-#: src/gpakeyselector.c:95 src/keylist.c:618 src/siglist.c:100
+#: src/gpakeyselector.c:95 src/keylist.c:606 src/siglist.c:100
 #: src/siglist.c:143 src/verifydlg.c:336
 msgid "User Name"
 msgstr "¥ÎªÌ¦WºÙ"
 
-#: src/gpakeysignop.c:188
+#: src/gpakeysignop.c:191
 msgid "No private key for signing."
 msgstr "¨S¦³¿ï¾Ü§@Ã±¸pªº¨pÆ_."
 
-#: src/gpakeysignop.c:233
+#: src/gpakeysignop.c:241
 msgid "This key has expired! Unable to sign."
 msgstr "³o¤½Æ_¤w¬O¹L®Éªº! ¤£¯à¥Î§@Ã±¸p."
 
-#: src/gpakeysignop.c:237
+#: src/gpakeysignop.c:245
 msgid "This key has already been signed with your own!"
 msgstr "³o¤½Æ_¤w³QÃ±¸p¤F!"
 
-#: src/gpakeysignop.c:242
+#: src/gpakeysignop.c:250
 msgid "You haven't selected a default key to sign with!"
 msgstr "¨S¦³¿ï¾Ü¹w³]Ã±¸pªº±KÆ_!"
 
@@ -882,7 +626,7 @@
 msgid "unknown"
 msgstr "¤£ª¾¦W"
 
-#: src/gparecvkeydlg.c:101
+#: src/gparecvkeydlg.c:106
 msgid "Which key do you want to import? (The key must be specified by key ID)."
 msgstr "¿ï¾Ün¶×¤Jªº±KÆ_. (½Ð¥²¶·´£¨Ñ±KÆ_ªº§Ç¸¹)."
 
@@ -906,7 +650,7 @@
 msgid "Size"
 msgstr "¤j¤p"
 
-#: src/gpasubkeylist.c:97 src/keyeditdlg.c:171 src/keylist.c:580
+#: src/gpasubkeylist.c:97 src/keyeditdlg.c:168 src/keylist.c:568
 msgid "Expiry Date"
 msgstr "¦³®Ä¤é´Á"
 
@@ -926,16 +670,16 @@
 msgid "Can authenticate"
 msgstr "¤¹³\µo©ñ"
 
-#: src/gpasubkeylist.c:137 src/gpgmetools.c:613 src/gpgmetools.c:821
-#: src/gpgmetools.c:940
+#: src/gpasubkeylist.c:137 src/gpgmetools.c:622 src/gpgmetools.c:833
+#: src/gpgmetools.c:952
 msgid "Revoked"
 msgstr "²¾°£"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:615 src/gpgmetools.c:936
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:948
 msgid "Expired"
 msgstr "¤w¸g¹L®É"
 
-#: src/gpasubkeylist.c:145 src/gpgmetools.c:617
+#: src/gpasubkeylist.c:145 src/gpgmetools.c:626
 msgid "Disabled"
 msgstr "¤w¸g¥¢®Ä"
 
@@ -943,41 +687,41 @@
 msgid "Unsigned"
 msgstr "¨S¦³Ã±¸p"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:927 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:939 src/verifydlg.c:212
 msgid "Valid"
 msgstr "¥¿½T"
 
-#: src/gpawidgets.c:72 src/gpgmetools.c:661 src/gpgmetools.c:668
-#: src/keyring.c:1176 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
+#: src/keyring.c:1248 src/keysigndlg.c:100
 msgid "User Name:"
 msgstr "¥ÎªÌ¦WºÙ :"
 
-#: src/gpawidgets.c:72 src/keysigndlg.c:104
+#: src/gpawidgets.c:72 src/keysigndlg.c:100
 msgid "User Names:"
 msgstr "¥ÎªÌ¦WºÙ :"
 
-#: src/gpawidgets.c:78 src/gpgmetools.c:662 src/gpgmetools.c:669
-#: src/keyring.c:1178
+#: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
+#: src/keyring.c:1250
 msgid "Key ID:"
 msgstr "±KÆ_ ID:"
 
-#: src/gpawidgets.c:194
+#: src/gpawidgets.c:180
 msgid "Expiration"
 msgstr "¦³®Ä´Á"
 
-#: src/gpawidgets.c:201
+#: src/gpawidgets.c:187
 msgid "_indefinitely valid"
 msgstr "¤£¥¿½Tªº¦Xªk (&i)"
 
-#: src/gpawidgets.c:210
+#: src/gpawidgets.c:195
 msgid "expire _after"
 msgstr "¥¢®Ä¦Û (&a)"
 
-#: src/gpawidgets.c:229
+#: src/gpawidgets.c:215
 msgid "expire o_n:"
 msgstr "¥¢®Ä´Á¬° (&n):"
 
-#: src/gpawidgets.c:302 src/keygendlg.c:295
+#: src/gpawidgets.c:289 src/keygendlg.c:291
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -985,20 +729,7 @@
 "!°õ¦æ¿ù»~!\n"
 "¦³®Ä´Á¤£ªkªº´¡¤J¼Ò¦¡."
 
-#: src/gpawizard.c:260
-#, fuzzy
-msgid "_Back"
-msgstr "/³Æ¥÷... (&B)"
-
-#: src/gpawizard.c:267
-msgid "_Forward"
-msgstr ""
-
-#: src/gpawizard.c:274
-msgid "_Apply"
-msgstr ""
-
-#: src/gpgmetools.c:58
+#: src/gpgmetools.c:59
 #, c-format
 msgid ""
 "Fatal Error in GPGME library\n"
@@ -1015,7 +746,7 @@
 "\n"
 "µ{¦¡·|³Q²×¤î"
 
-#: src/gpgmetools.c:72
+#: src/gpgmetools.c:73
 #, c-format
 msgid ""
 "The GPGME library returned an unexpected\n"
@@ -1033,8 +764,17 @@
 "\n"
 "³o¦³¥i¯à¬O GPA µ{¦¡ªº°ÝÃD.nGPA ²{¦b¹Á¸Õ±q¿ù»~¤¤¦^´_."
 
-#: src/gpgmetools.c:477
+#: src/gpgmetools.c:139
+#, c-format
 msgid ""
+"The file %s already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"ÀÉ®× %s ¤w¸g¦s¦b.\n"
+"n¶i¦æÂÐ¼g¶Ü?"
+
+#: src/gpgmetools.c:486
+msgid ""
 "************************************************************************\n"
 "* WARNING: This file is a backup of your secret key. Please keep it in *\n"
 "* a safe place.                                                        *\n"
@@ -1047,7 +787,7 @@
 "****************************************\n"
 "\n"
 
-#: src/gpgmetools.c:482
+#: src/gpgmetools.c:491
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -1055,186 +795,175 @@
 "¤w³Æ¥÷ªºÆ_¹ï¦bÀÉ®×ªº¬O :\n"
 "\n"
 
-#: src/gpgmetools.c:543
+#: src/gpgmetools.c:552
 msgid "DSA and ElGamal (default)"
 msgstr "DSA ¤Î EIGamal (¹w³])"
 
-#: src/gpgmetools.c:544
+#: src/gpgmetools.c:553
 msgid "DSA (sign only)"
 msgstr "¥uÃ±¸pªºDSA"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:554
 msgid "RSA (sign only)"
 msgstr "¥uÃ±¸pªº RSA"
 
-#: src/gpgmetools.c:581 src/gpgmetools.c:604 src/gpgmetools.c:621
-#: src/gpgmetools.c:932 src/gpgmetools.c:965
+#: src/gpgmetools.c:590 src/gpgmetools.c:613 src/gpgmetools.c:630
+#: src/gpgmetools.c:944 src/gpgmetools.c:977
 msgid "Unknown"
 msgstr "¤£ª¾¦W"
 
-#: src/gpgmetools.c:584
+#: src/gpgmetools.c:593
 msgid "Never"
 msgstr "¥Ã¤£«H¥ô"
 
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:596
 msgid "Marginal"
 msgstr "³¡¥÷«H¥ô"
 
-#: src/gpgmetools.c:590
+#: src/gpgmetools.c:599
 msgid "Full"
 msgstr "§¹¥þ«H¥ô"
 
-#: src/gpgmetools.c:593
+#: src/gpgmetools.c:602
 msgid "Ultimate"
 msgstr "¥Ã»·«H¥ô"
 
-#: src/gpgmetools.c:619
+#: src/gpgmetools.c:628
 msgid "Incomplete"
 msgstr "¤£§¹¾ãªº"
 
-#: src/gpgmetools.c:625
+#: src/gpgmetools.c:634
 msgid "Fully Valid"
 msgstr "§¹¥þ¦Xªkªº"
 
-#: src/gpgmetools.c:659
+#: src/gpgmetools.c:668
 msgid "Please enter the passphrase for the following key:"
 msgstr "¿é¤J¥H¤U±KÆ_ªº±K½X:"
 
-#: src/gpgmetools.c:667
+#: src/gpgmetools.c:676
 msgid "Wrong passphrase, please try again:"
 msgstr "±K½X¿ù»~, ½Ð¦A¹Á¸Õ :"
 
-#: src/gpgmetools.c:692
+#: src/gpgmetools.c:701
 msgid "Enter Passphrase"
 msgstr "¿é¤J±K½X"
 
-#: src/gpgmetools.c:814
+#: src/gpgmetools.c:826
 msgid "[None]"
 msgstr ""
 
-#: src/gpgmetools.c:904 src/verifydlg.c:269
+#: src/gpgmetools.c:916 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[¤£¦W¥ÎªÌID]"
 
-#: src/gpgmetools.c:930 src/verifydlg.c:217
+#: src/gpgmetools.c:942 src/verifydlg.c:217
 msgid "Bad"
 msgstr "¤£¦Xªkªº"
 
-#: src/gpgmetools.c:953
+#: src/gpgmetools.c:965
 msgid "Generic"
 msgstr "³q¥Î"
 
-#: src/gpgmetools.c:956
+#: src/gpgmetools.c:968
 msgid "Persona"
 msgstr "¨p¥Î"
 
-#: src/gpgmetools.c:959
+#: src/gpgmetools.c:971
 msgid "Casual"
 msgstr "Á{®É"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:974
 msgid "Positive"
 msgstr "½T©w"
 
-#: src/gpgmetools.c:980
+#: src/gpgmetools.c:992
 msgid "The key can be used for certification, signing and encryption."
 msgstr "±KÆ_¥i³Q¥Î§@ÅçÃÒ, Ã±¸p¤Î¥[±K."
 
-#: src/gpgmetools.c:983
+#: src/gpgmetools.c:995
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr "±KÆ_¥i³Q¥Î§@ÅçÃÒ¤ÎÃ±¸p, ¨Ã¤£¤¹³\¥Î¦b¥[±K¤W."
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:1001
 msgid "The key can be used for certification and encryption."
 msgstr "±KÆ_¥i¥Î§@ÅçÃÒ¤Î¥[±K."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:1004
 msgid "The key can be used only for certification."
 msgstr "±KÆ_¥u¥i¥Î§@ÅçÃÒ."
 
-#: src/gpgmetools.c:1000
+#: src/gpgmetools.c:1012
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
 msgstr "±KÆ_¥u¥i¥H³Q¥Î§@Ã±¸p¤Î¥[±K.¨Ã¤£¤¹³\¥Î¦bÅçÃÒ¥Î³~."
 
-#: src/gpgmetools.c:1003
+#: src/gpgmetools.c:1015
 msgid "The key can be used only for signing."
 msgstr "±KÆ_¥u¥i¥Î§@Ã±¸p."
 
-#: src/gpgmetools.c:1008
+#: src/gpgmetools.c:1020
 msgid "The key can be used only for encryption."
 msgstr "±KÆ_¥u¥i¥Î§@¥[±K."
 
-#: src/gpgmetools.c:1011
+#: src/gpgmetools.c:1023
 msgid "This key is useless."
 msgstr "±KÆ_¬O¤£¥i¨Ï¥Îªº."
 
-#: src/gtktools.c:320
+#: src/gtktools.c:48
 msgid "GPA Error"
 msgstr "GPA ¿ù»~"
 
-#: src/helpmenu.c:202
+#: src/helpmenu.c:83
 msgid "About GPA"
 msgstr "Ãö©óGPA"
 
-#: src/helpmenu.c:247
-msgid "Brought to you by:"
-msgstr "¥Ñ¥LÌ±aµ¹±zªº¬O:"
+#: src/helpmenu.c:89
+#, fuzzy
+msgid "GPA is the GNU Privacy Assistant."
+msgstr "¤F¸ÑGNU Privacy Assistant"
 
-#: src/helpmenu.c:284
+#: src/icons.c:199
 #, fuzzy
-msgid "GPA is Free Software under the"
-msgstr "GPA ¬O¦Û¥Ñ³n¥ó, ¨Ã¥H"
+msgid "_Verify"
+msgstr "ÅçÃÒ"
 
-#: src/helpmenu.c:288
-msgid "GNU General Public License."
-msgstr "GNU ¤½²³³\¥iµý"
+#: src/icons.c:200
+#, fuzzy
+msgid "_Encrypt"
+msgstr "¥[±K"
 
-#: src/helpmenu.c:292
-msgid "For news see:"
-msgstr "·s»D¤§¥Î:"
+#: src/icons.c:201
+#, fuzzy
+msgid "_Decrypt"
+msgstr "¸Ñ±K"
 
-#: src/helpmenu.c:297
+#: src/icons.c:202
 #, fuzzy
-msgid "http://www.gpg4win.org"
-msgstr "http://www.gnupg.org"
+msgid "_Brief"
+msgstr "ºKn"
 
-#: src/helpmenu.c:299
-msgid "http://www.gnupg.org"
-msgstr "http://www.gnupg.org"
+#: src/icons.c:203
+#, fuzzy
+msgid "_Detailed"
+msgstr "¸Ô±¡"
 
-#: src/helpmenu.c:382
+#: src/icons.c:204
 #, fuzzy
-msgid "GNU General Public License"
-msgstr "GNU ¤½²³³\¥iµý"
+msgid "_Keyring Editor"
+msgstr "Æ_°é½s¿è¾¹"
 
-#: src/helpmenu.c:409
+#: src/icons.c:205
 #, fuzzy
-msgid "_GNU General Public License"
-msgstr "GNU ¤½²³³\¥iµý"
+msgid "_Clipboard"
+msgstr "/µøµ¡/ÀÉ®×ºÞ²z (&F)"
 
-#: src/helpmenu.c:436
-msgid "Show Help Text\n"
-msgstr "Åã¥Ü¨D§U¤å¦r\n"
+#: src/icons.c:206
+#, fuzzy
+msgid "_File Manager"
+msgstr "ÀÉ®×ºÞ²zû"
 
-#: src/helpmenu.c:444
-msgid "/_Help"
-msgstr "/¨D§U"
-
-#: src/helpmenu.c:446
-msgid "/Help/_Contents"
-msgstr "/¨D§U/¤º®e (&L)"
-
-#: src/helpmenu.c:449
-msgid "/Help/_License"
-msgstr "/¨D§U/³\¥iµý (&L)"
-
-#: src/helpmenu.c:450
-msgid "/Help/_About"
-msgstr "/¨D§U/Ãö©ó (&A)"
-
 #: src/keydeletedlg.c:41
 msgid "Removing Secret Key"
 msgstr "²¾°£±KÆ_"
@@ -1277,23 +1006,27 @@
 msgid "Are you sure you want to delete this key?"
 msgstr "±z½T©wn§R°£³o±KÆ_?"
 
-#: src/keyeditdlg.c:149
+#: src/keyeditdlg.c:147
 msgid "Edit Key"
 msgstr "×§ï±KÆ_"
 
-#: src/keyeditdlg.c:165
+#: src/keyeditdlg.c:162
 msgid "Change _passphrase"
 msgstr "§ó§ï±K½X (&P)"
 
-#: src/keyeditdlg.c:185
+#: src/keyeditdlg.c:182
 msgid "Change _expiration"
 msgstr "§ïÅÜ¦³®Ä¤é´Á (&E)"
 
-#: src/keygendlg.c:58
+#: src/keygendlg.c:67
+msgid "You must enter a key size."
+msgstr ""
+
+#: src/keygendlg.c:72
 msgid "You must enter a User ID."
 msgstr ""
 
-#: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
+#: src/keygendlg.c:77 src/passwddlg.c:45
 msgid ""
 "In \"Passphrase\" and \"Repeat passphrase\",\n"
 "you must enter the same passphrase."
@@ -1301,7 +1034,7 @@
 "¦b \"±K½X\"¤Î\"«½Æ±K½X\",\n"
 "±z»Ýn¿é¤J¬Û¦Pªº±K½X."
 
-#: src/keygendlg.c:70 src/keygenwizard.c:314 src/passwddlg.c:52
+#: src/keygendlg.c:84 src/passwddlg.c:52
 msgid ""
 "You did not enter a passphrase.\n"
 "It is needed to protect your private key."
@@ -1309,7 +1042,7 @@
 "±z¨Ã¨S¦³¿é¤J±K½X.\n"
 "³oÓ±K½X¬O»Ýn¥Î§@«OÅ@±KÆ_ªº."
 
-#: src/keygendlg.c:83 src/keygenwizard.c:328 src/passwddlg.c:65
+#: src/keygendlg.c:97 src/passwddlg.c:65
 msgid ""
 "Warning: You have entered a passphrase\n"
 "that is obviously not secure.\n"
@@ -1321,23 +1054,25 @@
 "\n"
 "½Ð¿é¤J·sªº±K½X."
 
-#: src/keygendlg.c:88 src/keygenwizard.c:333 src/passwddlg.c:70
+#: src/keygendlg.c:102 src/passwddlg.c:70
 msgid "_Enter new passphrase"
 msgstr "¿é¤J·s±K½X (&E)"
 
-#: src/keygendlg.c:89 src/keygenwizard.c:334 src/passwddlg.c:71
+#: src/keygendlg.c:104 src/passwddlg.c:71
 msgid "Take this one _anyway"
 msgstr "±j¦æ¨Ï¥Î³oÓ±K½X (&A)"
 
-#: src/keygendlg.c:144 src/keygenwizard.c:541
+#: src/keygendlg.c:150 src/keygenwizard.c:571 src/keygenwizard.c:584
+#: src/keygenwizard.c:594 src/keygenwizard.c:604 src/keygenwizard.c:616
+#: src/keygenwizard.c:633 src/keygenwizard.c:645
 msgid "Generate key"
 msgstr "«Ø¥ß·sÆ_"
 
-#: src/keygendlg.c:185
+#: src/keygendlg.c:177
 msgid "_Algorithm: "
 msgstr "¥[±Kºâ¦¡ (&A):"
 
-#: src/keygendlg.c:197
+#: src/keygendlg.c:192
 msgid "_Key size (bits): "
 msgstr "±KÆ_¤j¤p (¦ì):"
 
@@ -1353,27 +1088,27 @@
 msgid "2048"
 msgstr "2048"
 
-#: src/keygendlg.c:216
+#: src/keygendlg.c:206
 msgid "_User ID: "
 msgstr "¥ÎªÌID (&U):"
 
-#: src/keygendlg.c:226
+#: src/keygendlg.c:217
 msgid "_Email: "
 msgstr "¹q¶l (&E):"
 
-#: src/keygendlg.c:236
+#: src/keygendlg.c:226
 msgid "_Comment: "
 msgstr "³Æµù (&C):"
 
-#: src/keygendlg.c:248
+#: src/keygendlg.c:235
 msgid "_Passphrase: "
 msgstr "±K½X (&P):"
 
-#: src/keygendlg.c:260
+#: src/keygendlg.c:246
 msgid "_Repeat passphrase: "
 msgstr "«½Æ±K½X (&R):"
 
-#: src/keygenwizard.c:152
+#: src/keygenwizard.c:172
 msgid ""
 "Please insert your full name.\n"
 "\n"
@@ -1384,19 +1119,16 @@
 "\n"
 "³oÓ¦W¦r·|¬OÆ_ªº¤@³¡¥÷¨Ï¨ä¥L¤H®e©ö¿ë»{±zªº±KÆ_."
 
-#: src/keygenwizard.c:157
+#: src/keygenwizard.c:175
 msgid "Your Name:"
 msgstr "±zªº¦W¦r:"
 
-#: src/keygenwizard.c:170
-msgid "Please insert your name"
-msgstr "½Ð¿é¤J±zªº¦W¦r"
-
-#: src/keygenwizard.c:183
+#: src/keygenwizard.c:211
+#, fuzzy
 msgid ""
 "Please insert your email address.\n"
 "\n"
-" Your email address will be part of the new key to make it easier for others "
+"Your email address will be part of the new key to make it easier for others "
 "to identify keys. If you have several email addresses, you can add further "
 "email adresses later."
 msgstr ""
@@ -1405,27 +1137,40 @@
 "±zªº¹q¶l¦a§}·|¬OÆ_ªº¤@³¡¥÷¨Ï¨ä¥L¤H®e©ö¿ë»{±z. ¦pªG±z¦³¦hÓ¹q¶l¦a§}, ±z¥i¥H¦b"
 "¤é«á¦A¼W¥[."
 
-#: src/keygenwizard.c:190
+#: src/keygenwizard.c:215
 msgid "Your Email Address:"
 msgstr "±zªº¹q¶l¦a§}:"
 
-#: src/keygenwizard.c:205
-msgid "Please insert your email address"
-msgstr "½Ð¿é¤J±zªº¹q©Ò¦a§}"
-
-#: src/keygenwizard.c:239
+#: src/keygenwizard.c:319
 msgid "Please choose a passphrase for the new key."
 msgstr "½Ð¿é¤J·sÆ_ªº±K½X."
 
-#: src/keygenwizard.c:248 src/passwddlg.c:108
+#: src/keygenwizard.c:326
+#, fuzzy
+msgid ""
+"In \"Passphrase\" and \"Repeat passphrase\", you must enter the same "
+"passphrase."
+msgstr ""
+"¦b \"±K½X\"¤Î\"«½Æ±K½X\",\n"
+"±z»Ýn¿é¤J¬Û¦Pªº±K½X."
+
+#: src/keygenwizard.c:335
+msgid "Warning: The passphrase you have entered is not very secure."
+msgstr ""
+
+#: src/keygenwizard.c:350
+msgid "Quality: "
+msgstr ""
+
+#: src/keygenwizard.c:358 src/passwddlg.c:111
 msgid "Passphrase: "
 msgstr "±K½X :"
 
-#: src/keygenwizard.c:261 src/passwddlg.c:117
+#: src/keygenwizard.c:370 src/passwddlg.c:120
 msgid "Repeat Passphrase: "
 msgstr "«½Æ±K½X :"
 
-#: src/keygenwizard.c:358
+#: src/keygenwizard.c:412
 msgid ""
 "It is recommended that you create a backup copy of your new key, once it has "
 "been generated.\n"
@@ -1436,15 +1181,15 @@
 "\n"
 "±z¬O§_·Q»s§@¤@Ó³Æ¥÷?"
 
-#: src/keygenwizard.c:367
+#: src/keygenwizard.c:420
 msgid "Create _backup copy"
 msgstr "«Ø¥ß³Æ¥÷ (&b)"
 
-#: src/keygenwizard.c:374 src/keyring.c:739 src/keyring.c:767
+#: src/keygenwizard.c:425 src/keyring.c:737 src/keyring.c:763
 msgid "Do it _later"
 msgstr "©¹«á¤~¶i¦æ (&l)"
 
-#: src/keygenwizard.c:402
+#: src/keygenwizard.c:454
 msgid ""
 "Your key is being generated.\n"
 "\n"
@@ -1454,7 +1199,7 @@
 "\n"
 "¦b§ó§Öªº¹q¸£¤W¤]¥i¯ànµ¥«J¤@¬q®É¶¡. ½Ðµ¥«J..."
 
-#: src/keygenwizard.c:411
+#: src/keygenwizard.c:463
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -1473,44 +1218,44 @@
 "GnuPG ¥¿¦b««Ø¸ê®Æ®w.\n"
 "½Ð@¤ßµ¥Ô..."
 
-#: src/keylist.c:559
+#: src/keylist.c:547
 msgid ""
 "This columns lists the type of the certificate.  A 'P' denotes OpenPGP and a "
 "'X' denotes X.509 (S/MIME)."
 msgstr ""
 
-#: src/keylist.c:568
+#: src/keylist.c:556
 #, fuzzy
 msgid "The key ID is a short number to identify a certificate."
 msgstr "±KÆ_¥u¥i¥Î§@ÅçÃÒ."
 
-#: src/keylist.c:581
+#: src/keylist.c:569
 msgid "The Expiry Date is the date until the certificate is valid."
 msgstr ""
 
-#: src/keylist.c:591 src/ownertrustdlg.c:122
+#: src/keylist.c:579 src/ownertrustdlg.c:123
 msgid "Owner Trust"
 msgstr "¬Û«H¾Ö¦³ªÌ"
 
-#: src/keylist.c:592
+#: src/keylist.c:580
 msgid ""
 "The Owner Trust has been set by you and describes how far you trust the "
 "holder of the certificate to correctly sign (certify) other certificates.  "
 "It is only meaningful for OpenPGP."
 msgstr ""
 
-#: src/keylist.c:604
+#: src/keylist.c:592
 #, fuzzy
 msgid "Validity"
 msgstr "ÆJÃÒ¤½Æ_"
 
-#: src/keylist.c:605
+#: src/keylist.c:593
 msgid ""
 "The Validity describes the trust level the system has in this certificate.  "
 "That is how sure it is that the named user is actually that user."
 msgstr ""
 
-#: src/keylist.c:619
+#: src/keylist.c:607
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
@@ -1520,372 +1265,279 @@
 msgid "No keys selected for signing."
 msgstr "¨S¦³¿ï¾Ü§@Ã±¸pªº±KÆ_."
 
-#: src/keyring.c:734
+#: src/keyring.c:732
 msgid ""
 "You do not have a private key yet. Do you want to generate one now "
 "(recommended) or do it later?"
 msgstr "±z¨Ã¨S¦³¨pÆ_, «ØÄ³±z²{¦b«Ø¥ß©Î¬O©¹«á¤~«Ø¥ß?"
 
-#: src/keyring.c:738
+#: src/keyring.c:736
 msgid "_Generate key now"
 msgstr "²{¦b«Ø¥ßÆ_ (&G)"
 
-#: src/keyring.c:761
+#: src/keyring.c:757
 msgid ""
 "You do not have a backup copy of your private key yet. Do you want to backup "
 "your key now (recommended) or do it later?"
 msgstr "±z¨Ã¨S¦³¨pÆ_, «ØÄ³±z²{¦b«Ø¥ß©Î¬O©¹«á¤~«Ø¥ß?"
 
-#: src/keyring.c:766
+#: src/keyring.c:762
 msgid "_Backup key now"
 msgstr "²{¦b¶i¦æ³Æ¥÷ (&G)"
 
-#: src/keyring.c:883
-msgid "/_Keys"
-msgstr "/Æ_¹ï"
-
-#: src/keyring.c:884
-msgid "/Keys/_Refresh"
-msgstr ""
-
 #: src/keyring.c:886
 #, fuzzy
-msgid "/Keys/sep0"
-msgstr "/Æ_¹ï/sep1"
+msgid "_Keys"
+msgstr "/Æ_¹ï"
 
 #: src/keyring.c:887
-msgid "/Keys/_New Key..."
-msgstr "/Æ_¹ï/«Ø¥ß·sÆ_... (&N)"
+#, fuzzy
+msgid "_Server"
+msgstr "/¦øªA¾¹"
 
-#: src/keyring.c:889
-msgid "/Keys/_Delete Keys..."
-msgstr "/Æ_¹ï/§R°£·sÆ_... (&D)"
+#: src/keyring.c:901
+msgid "Select all certificates"
+msgstr ""
 
-#: src/keyring.c:891
-msgid "/Keys/sep1"
-msgstr "/Æ_¹ï/sep1"
+#: src/keyring.c:906
+msgid "Refresh the keyring"
+msgstr ""
 
-#: src/keyring.c:892
-msgid "/Keys/_Sign Keys..."
-msgstr "/Æ_¹ï/Ã±¸p¤½Æ_... (&S)"
+#: src/keyring.c:907
+#, fuzzy
+msgid "_New key..."
+msgstr "/Æ_¹ï/«Ø¥ß·sÆ_... (&N)"
 
-#: src/keyring.c:893
-msgid "/Keys/Set _Owner Trust..."
-msgstr "/Æ_¹ï/§ïÅÜ«H¥ô«×... (&O)"
+#: src/keyring.c:908
+#, fuzzy
+msgid "Generate a new key"
+msgstr "«Ø¥ß·sÆ_"
 
-#: src/keyring.c:894
-msgid "/Keys/_Edit Private Key..."
-msgstr "/Æ_¹ï/×§ï±KÆ_... (&E)"
+#: src/keyring.c:909
+#, fuzzy
+msgid "_Delete keys"
+msgstr "/§R°£±KÆ_... (&D)"
 
-#: src/keyring.c:895
-msgid "/Keys/sep2"
-msgstr "/Æ_¹ï/sep2"
+#: src/keyring.c:910
+msgid "Remove the selected key"
+msgstr "²¾°£¤w¿ï¾Üªº±KÆ_"
 
-#: src/keyring.c:896
-msgid "/Keys/_Import Keys..."
-msgstr "/Æ_¹ï/¶×¤JÆ_¹ï... (&I)"
+#: src/keyring.c:911
+#, fuzzy
+msgid "_Sign Keys..."
+msgstr "/Ã±¸p¤½Æ_... (&S)"
 
-#: src/keyring.c:897
-msgid "/Keys/E_xport Keys..."
-msgstr "/Æ_¹ï/¶×¥XÆ_¹ï... (&X)"
+#: src/keyring.c:912
+msgid "Sign the selected key"
+msgstr "Ã±¸p¤w¿ï¾Üªº±KÆ_"
 
-#: src/keyring.c:898
-msgid "/Keys/_Backup..."
-msgstr "/Æ_¹ï/³Æ¥÷... (&B)"
+#: src/keyring.c:913
+#, fuzzy
+msgid "Set _Owner Trust..."
+msgstr "/³]©w«H¥ô«×... (&O)"
 
-#: src/keyring.c:901
-msgid "/_Server"
-msgstr "/¦øªA¾¹"
+#: src/keyring.c:914
+#, fuzzy
+msgid "Set owner trust of the selected key"
+msgstr "²¾°£¤w¿ï¾Üªº±KÆ_"
 
-#: src/keyring.c:902
-msgid "/Server/_Retrieve Keys..."
-msgstr "/¦øªA¾¹/¤U¸ü¤½Æ_... (&R)"
+#: src/keyring.c:916
+#, fuzzy
+msgid "_Edit Private Key..."
+msgstr "/×§ï¨pÆ_... (&E)"
 
-#: src/keyring.c:903
-msgid "/Server/_Send Keys..."
-msgstr "/¦øªA¾¹/¤W¶Ç¤½Æ_... (&S)"
+#: src/keyring.c:917
+msgid "Edit the selected private key"
+msgstr "×§ï¤w¿ï¾Üªº±KÆ_"
 
-#: src/keyring.c:908
+#: src/keyring.c:919
 #, fuzzy
-msgid "/Windows/_File Manager"
-msgstr "/µøµ¡/ÀÉ®×ºÞ²z (&F)"
+msgid "_Import Keys..."
+msgstr "¶×¤J±KÆ_"
 
-#: src/keyring.c:939
-msgid "/Keys/Export Keys..."
-msgstr "/Æ_¹ï/¶×¥XÆ_¹ï..."
+#: src/keyring.c:920
+msgid "Import Keys"
+msgstr "¶×¤J±KÆ_"
 
-#: src/keyring.c:944
-msgid "/Keys/Delete Keys..."
-msgstr "/Æ_¹ï/«Ø¥ß·sÆ_... (&G)"
+#: src/keyring.c:921
+#, fuzzy
+msgid "E_xport Keys..."
+msgstr "/¶×¥XÆ_¹ï... (&X)"
 
-#: src/keyring.c:952
-msgid "/Server/Send Keys..."
-msgstr "/¦øªA¾¹/¤W¶Ç¤½Æ_..."
+#: src/keyring.c:922
+msgid "Export Keys"
+msgstr "¿é¥X±KÆ_"
 
-#: src/keyring.c:959
-msgid "/Keys/Set Owner Trust..."
-msgstr "/Æ_¹ï/§ïÅÜ«H¥ô«×..."
+#: src/keyring.c:923
+#, fuzzy
+msgid "_Backup..."
+msgstr "/³Æ¥÷... (&B)"
 
-#: src/keyring.c:966
-msgid "/Keys/Sign Keys..."
-msgstr "/Æ_¹ï/Ã±¸p¤½Æ_..."
+#: src/keyring.c:924
+#, fuzzy
+msgid "Backup key"
+msgstr "³Æ¥÷±KÆ_"
 
-#: src/keyring.c:972
-msgid "/Keys/Edit Private Key..."
-msgstr "/Æ_¹ï/×§ï±KÆ_..."
+#: src/keyring.c:927
+#, fuzzy
+msgid "_Retrieve Keys..."
+msgstr "/¦øªA¾¹/¤U¸ü¤½Æ_... (&R)"
 
-#: src/keyring.c:977
-msgid "/Keys/Backup..."
-msgstr "/Æ_¹ï/³Æ¥÷..."
+#: src/keyring.c:928
+msgid "Retrieve keys from server"
+msgstr ""
 
-#: src/keyring.c:994
-msgid "/_Copy"
-msgstr "/½Æ»s (&C)"
-
-#: src/keyring.c:996
-msgid "/_Paste"
-msgstr "/¶K¤W (&P)"
-
-#: src/keyring.c:998
-msgid "/_Delete Keys..."
-msgstr "/§R°£±KÆ_... (&D)"
-
-#: src/keyring.c:1001
-msgid "/_Sign Keys..."
+#: src/keyring.c:930
+#, fuzzy
+msgid "_Send Keys..."
 msgstr "/Ã±¸p¤½Æ_... (&S)"
 
-#: src/keyring.c:1002
-msgid "/Set _Owner Trust..."
-msgstr "/³]©w«H¥ô«×... (&O)"
+#: src/keyring.c:931
+#, fuzzy
+msgid "Send keys to server"
+msgstr "±H¥X¤½Æ_¨ì¦øªA¾¹... (&N)"
 
-#: src/keyring.c:1003
-msgid "/_Edit Private Key..."
-msgstr "/×§ï¨pÆ_... (&E)"
+#: src/keyring.c:937
+msgid "Show Brief Keylist"
+msgstr "Åã¥Ü±KÆ_²M³æºKn"
 
-#: src/keyring.c:1005
-msgid "/E_xport Keys..."
-msgstr "/¶×¥XÆ_¹ï... (&X)"
+#: src/keyring.c:939
+msgid "Show Key Details"
+msgstr "Åã¥Ü±KÆ_¸Ô±¡"
 
-#: src/keyring.c:1006
-msgid "/Se_nd Keys to Server..."
-msgstr "±H¥X¤½Æ_¨ì¦øªA¾¹... (&N)"
+#: src/keyring.c:1063
+msgid "Edit"
+msgstr "×§ï"
 
-#: src/keyring.c:1007
-msgid "/_Backup..."
-msgstr "/³Æ¥÷... (&B)"
+#: src/keyring.c:1065
+#, fuzzy
+msgid "Delete"
+msgstr "/½s¿è/¥þ³¡¿ï¾Ü (&A)"
 
-#: src/keyring.c:1018
-msgid "/Set Owner Trust..."
-msgstr "/³]©w«H¥ô«×..."
+#: src/keyring.c:1067
+msgid "Sign"
+msgstr "Ã±¸p"
 
-#: src/keyring.c:1025
-msgid "/Sign Keys..."
-msgstr "/Ã±¸p¤½Æ_..."
+#: src/keyring.c:1069
+msgid "Export"
+msgstr "¿é¥X"
 
-#: src/keyring.c:1031
-msgid "/Edit Private Key..."
-msgstr "/×§ï¨pÆ_..."
+#: src/keyring.c:1071
+msgid "Import"
+msgstr "¶×¤J"
 
-#: src/keyring.c:1036
-msgid "/Backup..."
-msgstr "/³Æ¥÷..."
-
-#: src/keyring.c:1106
+#: src/keyring.c:1178
 msgid "Subkeys"
 msgstr "¤lÆ_"
 
-#: src/keyring.c:1180 src/keysigndlg.c:110
+#: src/keyring.c:1252 src/keysigndlg.c:106
 msgid "Fingerprint:"
 msgstr "«ü¯¾:"
 
-#: src/keyring.c:1182
+#: src/keyring.c:1254
 msgid "Expires at:"
 msgstr "¦³®Ä´Á¦Ü:"
 
-#: src/keyring.c:1184
+#: src/keyring.c:1256
 msgid "Owner Trust:"
 msgstr "¾Ö¦³ªÌ«H¥ô:"
 
-#: src/keyring.c:1186
+#: src/keyring.c:1258
 msgid "Key Validity:"
 msgstr "»{¥¿¤½Æ_:"
 
-#: src/keyring.c:1188
+#: src/keyring.c:1260
 msgid "Key Type:"
 msgstr "±KÆ_ºØÃþ:"
 
-#: src/keyring.c:1190
+#: src/keyring.c:1262
 msgid "Created at:"
 msgstr "«Ø¥ß¦b :"
 
-#: src/keyring.c:1193
+#: src/keyring.c:1265
 msgid "Details"
 msgstr "¸Ô±¡"
 
-#: src/keyring.c:1201
+#: src/keyring.c:1273
 msgid "Show signatures on user name:"
 msgstr "¦b¥ÎªÌ¦WºÙÅã¥ÜÃ±¸p:"
 
-#: src/keyring.c:1225
+#: src/keyring.c:1298
 msgid "Signatures"
 msgstr "Ã±¸p"
 
-#: src/keyring.c:1249
+#: src/keyring.c:1322
 msgid "The key has both a private and a public part"
 msgstr "³o¬O¦³¨p¤H¤Î¤½¦@³¡¥÷ªº§¹Æ_"
 
-#: src/keyring.c:1252
+#: src/keyring.c:1325
 msgid "The key has only a public part"
 msgstr "³o±KÆ_¥u¦³¤½¦@³¡¥÷"
 
-#: src/keyring.c:1287
+#: src/keyring.c:1360
 #, c-format
 msgid "%s %u bits"
 msgstr "%s %u ¦ì"
 
-#: src/keyring.c:1312
+#: src/keyring.c:1385
 msgid "No keys selected"
 msgstr "¨S¦³¿ï¾Ü±KÆ_"
 
-#: src/keyring.c:1315
+#: src/keyring.c:1388
 #, fuzzy, c-format
 msgid "%d key selected"
 msgid_plural "%d keys selected"
 msgstr[0] "%d ±KÆ_³Q¿ï¾Ü"
 msgstr[1] "%d ±KÆ_³Q¿ï¾Ü"
 
-#: src/keyring.c:1347
+#: src/keyring.c:1423
 msgid "All signatures"
 msgstr "©Ò¦³Ã±¸p"
 
-#: src/keyring.c:1552
-msgid "Edit"
-msgstr "×§ï"
-
-#: src/keyring.c:1553
-msgid "Edit the selected private key"
-msgstr "×§ï¤w¿ï¾Üªº±KÆ_"
-
-#: src/keyring.c:1554
-msgid "edit key"
-msgstr "×§ï±KÆ_"
-
-#: src/keyring.c:1562
-msgid "Remove the selected key"
-msgstr "²¾°£¤w¿ï¾Üªº±KÆ_"
-
-#: src/keyring.c:1563
-msgid "remove key"
-msgstr "²¾°£±KÆ_"
-
-#: src/keyring.c:1571
-msgid "Sign the selected key"
-msgstr "Ã±¸p¤w¿ï¾Üªº±KÆ_"
-
-#: src/keyring.c:1571
-msgid "sign key"
-msgstr "Ã±¸p±KÆ_"
-
 #: src/keyring.c:1578
-msgid "Import"
-msgstr "¶×¤J"
-
-#: src/keyring.c:1579
-msgid "Import Keys"
-msgstr "¶×¤J±KÆ_"
-
-#: src/keyring.c:1579
-msgid "import keys"
-msgstr "¶×¤J±KÆ_"
-
-#: src/keyring.c:1584
-msgid "Export"
-msgstr "¿é¥X"
-
-#: src/keyring.c:1585
-msgid "Export Keys"
-msgstr "¿é¥X±KÆ_"
-
-#: src/keyring.c:1585
-msgid "export keys"
-msgstr "¿é¥X±KÆ_"
-
-#: src/keyring.c:1598
-msgid "Brief"
-msgstr "ºKn"
-
-#: src/keyring.c:1598
-msgid "Show Brief Keylist"
-msgstr "Åã¥Ü±KÆ_²M³æºKn"
-
-#: src/keyring.c:1599
-msgid "brief"
-msgstr "ºKn"
-
-#: src/keyring.c:1610
-msgid "Detailed"
-msgstr "¸Ô±¡"
-
-#: src/keyring.c:1610
-msgid "Show Key Details"
-msgstr "Åã¥Ü±KÆ_¸Ô±¡"
-
-#: src/keyring.c:1611
-msgid "detailed"
-msgstr "¸Ô±¡"
-
-#: src/keyring.c:1639
-msgid "Refresh the keyring"
-msgstr ""
-
-#: src/keyring.c:1640
-msgid "refresh keyring"
-msgstr ""
-
-#: src/keyring.c:1711
 #, fuzzy
 msgid "Selected default key:"
 msgstr "¿ï¾Ü¹w³]±KÆ_:"
 
-#: src/keyring.c:1721
+#: src/keyring.c:1588
 msgid "No default key selected in the preferences."
 msgstr ""
 
-#: src/keyring.c:1833
+#: src/keyring.c:1701
 msgid "GNU Privacy Assistant - Keyring Editor"
 msgstr "GNU Privacy Assistant - Æ_°é½s¿è¾¹"
 
-#: src/keyring.c:1865
+#: src/keyring.c:1728
 msgid "Keyring Editor"
 msgstr "Æ_°é½s¿è¾¹"
 
-#: src/keysigndlg.c:60
+#: src/keysigndlg.c:59
 msgid "Sign Key"
 msgstr "Ã±¸p±KÆ_"
 
-#: src/keysigndlg.c:76
+#: src/keysigndlg.c:72
 msgid "Do you want to sign the following key?"
 msgstr "±z§Æ±æÃ±¸p¥H¤Uªº±KÆ_ ?"
 
-#: src/keysigndlg.c:120
+#: src/keysigndlg.c:116
 msgid ""
 "Check the name and fingerprint carefully to be sure that it really is the "
 "key you want to sign."
 msgstr "ÀË¬d±KÆ_ªº¦WºÙ¤Î«ü¯¾¥H½T©w¨S¦³¿ù»~."
 
-#: src/keysigndlg.c:128
+#: src/keysigndlg.c:124
 msgid "All user names in this key will be signed."
 msgstr "©Ò¦³¦b³oÓÆ_¤Uªº¥ÎªÌ³£§@Ã±¸p."
 
-#: src/keysigndlg.c:134
+#: src/keysigndlg.c:130
 msgid "The key will be signed with your default private key."
 msgstr "³o±KÆ_·|¥H±zªº¨pÆ_Ã±¸p."
 
-#: src/keysigndlg.c:141
+#: src/keysigndlg.c:137
 msgid "Sign only _locally"
 msgstr "¥u¬O¥»¦a¤WªºÃ±¸p (&l)"
 
-#: src/options.c:316
+#: src/options.c:323
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -1893,34 +1545,34 @@
 "¤w¿ï§@¬°¹w³]ªº¨pÆ_¨Ã¤£¯à¨Ï¥Î.\n"
 "GPA ·|¹Á¸Õ¦Û°Ê¿ï¾Ü¨ä¥L¨pÆ_."
 
-#: src/ownertrustdlg.c:106
+#: src/ownertrustdlg.c:107
 msgid "Change key ownertrust"
 msgstr "§ïÅÜ«H¥ô«×"
 
-#: src/ownertrustdlg.c:130
+#: src/ownertrustdlg.c:131
 msgid "_Unknown"
 msgstr "¤£ª¾¦W (&U)"
 
-#: src/ownertrustdlg.c:135
+#: src/ownertrustdlg.c:136
 msgid ""
 "You don't know how much to trust this user to verify other people's keys.\n"
 msgstr "¤£ª¾¹D«H¥ô³o¤½Æ_ªº«H¥ôµ{«×.\n"
 
-#: src/ownertrustdlg.c:145
+#: src/ownertrustdlg.c:146
 msgid "_Never"
 msgstr "¥Ã¤£«H¥ô (&N)"
 
-#: src/ownertrustdlg.c:150
+#: src/ownertrustdlg.c:151
 msgid ""
 "You don't trust this user at all to verify the validity of other people's "
 "keys at all.\n"
 msgstr "§¹¥þ¤£«H¥ô©Ò¦³³oÓ¥ÎªÌªº¸ê®Æ\n"
 
-#: src/ownertrustdlg.c:160
+#: src/ownertrustdlg.c:161
 msgid "_Marginal"
 msgstr "³¡¥÷«H¥ô (&M)"
 
-#: src/ownertrustdlg.c:165
+#: src/ownertrustdlg.c:166
 msgid ""
 "You don't trust this user's ability to verify the validity of other people's "
 "keys enough to consider keys valid based on his/her sole word.\n"
@@ -1932,11 +1584,11 @@
 "¦ý¬O³oÓ¥ÎªÌªº¤½Æ_¬O¦Xªkªº, ¦pªG³oÓ¥ÎªÌªº¤½Æ_³Q¨â¤H¥H«e©ÒÃ±¸p, ±z·|«H¥ô³oÓ"
 "¤½Æ_\n"
 
-#: src/ownertrustdlg.c:182
+#: src/ownertrustdlg.c:183
 msgid "_Full"
 msgstr "§¹¥þ«H¥ô (&F)"
 
-#: src/ownertrustdlg.c:187
+#: src/ownertrustdlg.c:188
 msgid ""
 "You trust this user's ability to verify the validity of other people's keys "
 "so much, that you'll consider valid any key signed by him/her, provided this "
@@ -1945,11 +1597,11 @@
 "±z«H¥ô³oÓ¥ÎªÌ¦³¯à¤OÅçÃÒ¨ä¥L¤Hªº¤½Æ_.¨Ã¥B±z·|»{¬°©Ò¦³¥Ñ³oÓ¤½Æ_©ÒÃ±¸pªº¤å¥ó³£"
 "·|¬O¦Xªk¤Î¥¿½Tªº.\n"
 
-#: src/ownertrustdlg.c:200
+#: src/ownertrustdlg.c:201
 msgid "U_ltimate"
 msgstr "¥Ã»·«H¥ô (&L)"
 
-#: src/ownertrustdlg.c:205
+#: src/ownertrustdlg.c:206
 msgid ""
 "You consider this key valid, and trust the user so much that you will "
 "consider any key signed by him/her fully valid.\n"
@@ -2037,37 +1689,147 @@
 "¨S¦³»P¦øªA¾¹³q°T¨ó©w¨Ï¥Îªº\n"
 "¥~±¾¼Ò²Õ"
 
-#: src/server_access.c:528 src/server_access.c:574
+#: src/server_access.c:528 src/server_access.c:572
 msgid "The keyserver you specified is not valid"
 msgstr "¦øªA¾¹¨Ã¤£¥¿½T"
 
-#: src/settingsdlg.c:59
+#: src/settingsdlg.c:133 src/siglist.c:135
+msgid "Local"
+msgstr "¥»°Ïªº"
+
+#: src/settingsdlg.c:134
+msgid "Local, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:135
 #, fuzzy
+msgid "Local, PKA"
+msgstr "¥»°Ïªº"
+
+#: src/settingsdlg.c:136
+msgid "Local, PKA, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:137
+msgid "Local, Keyserver, PKA"
+msgstr ""
+
+#: src/settingsdlg.c:138
+#, fuzzy
+msgid "Local, kDNS"
+msgstr "¥»°Ïªº"
+
+#: src/settingsdlg.c:139
+msgid "Local, kDNS, Keyserver"
+msgstr ""
+
+#: src/settingsdlg.c:140
+msgid "PKA"
+msgstr ""
+
+#: src/settingsdlg.c:141
+msgid "kDNS"
+msgstr ""
+
+#: src/settingsdlg.c:142
+msgid "Custom"
+msgstr ""
+
+#: src/settingsdlg.c:208
+#, fuzzy
+msgid "<b>User interface</b>"
+msgstr "¨Ï¥Î¶i¶¥¼Ò¦¡ (&A):"
+
+#: src/settingsdlg.c:215
+#, fuzzy
+msgid "Use _advanced mode"
+msgstr "¨Ï¥Î¶i¶¥¼Ò¦¡ (&A):"
+
+#: src/settingsdlg.c:221
+msgid "Show advanced _options"
+msgstr ""
+
+#: src/settingsdlg.c:272
+msgid ""
+"No default key has been selected.  This may lead to problems when signing or "
+"encrypting.  For example you might later not be able to read a mail written "
+"by you and encrypted to someone else.\n"
+"\n"
+"Please consider creating your own key and select it then."
+msgstr ""
+
+#: src/settingsdlg.c:278
+msgid "Continue without a default key"
+msgstr ""
+
+#: src/settingsdlg.c:280
+#, fuzzy
+msgid "Let me select a default key"
+msgstr "¿ï¾Ü¹w³]±KÆ_:"
+
+#: src/settingsdlg.c:305
+#, fuzzy
 msgid "<b>Default _key</b>"
 msgstr "¹w³]±KÆ_ (&K):"
 
-#: src/settingsdlg.c:111
+#: src/settingsdlg.c:405
 #, fuzzy
 msgid "<b>Default key_server</b>"
 msgstr "¹w³]¤½Æ_¦øªA¾¹ :"
 
-#: src/settingsdlg.c:158
+#: src/settingsdlg.c:602
 #, fuzzy
-msgid "<b>Use _advanced mode</b>"
-msgstr "¨Ï¥Î¶i¶¥¼Ò¦¡ (&A):"
+msgid "<b>Auto key _locate</b>"
+msgstr "¹w³]¤½Æ_¦øªA¾¹ :"
 
-#: src/settingsdlg.c:193
-msgid "Settings"
-msgstr "³]©w"
+#: src/settingsdlg.c:612
+msgid ""
+"The list of methods to locate keys via an email address.\n"
+"All given methods are used in turn until a matching key is found.  The "
+"supported methods are:\n"
+" Local\n"
+"   - Use the local keyring.\n"
+" Keyserver\n"
+"   - Use the default keyserver.\n"
+" PKA\n"
+"   - Use the Public Key Association.\n"
+" kDNS\n"
+"   - Use kDNS with the nameserver below.\n"
+" Custom\n"
+"   - Configured in the backend dialog.\n"
+msgstr ""
 
+#: src/settingsdlg.c:627
+msgid "Method:"
+msgstr ""
+
+#: src/settingsdlg.c:644
+msgid "The IP address of the nameserver used for the kDNS method."
+msgstr ""
+
+#: src/settingsdlg.c:646
+#, fuzzy
+msgid "kDNS Server:"
+msgstr "/¦øªA¾¹"
+
+#: src/settingsdlg.c:740
+#, fuzzy
+msgid "The URL given for the keyserver is not valid."
+msgstr "¦øªA¾¹¨Ã¤£¥¿½T"
+
+#: src/settingsdlg.c:749
+msgid "The data given for \"Auto key locate\" is not valid."
+msgstr ""
+
+#: src/settingsdlg.c:886
+#, fuzzy
+msgid "GNU Privacy Assistant - Settings"
+msgstr "GNU Privacy Assistant - Æ_°é½s¿è¾¹"
+
 #: src/siglist.c:128
 msgid "Level"
 msgstr "µ{«×"
 
-#: src/siglist.c:135
-msgid "Local"
-msgstr "¥»°Ïªº"
-
 #: src/verifydlg.c:116
 #, fuzzy
 msgid "Verify documents"
@@ -2095,6 +1857,344 @@
 msgid "Signatures:"
 msgstr "Ã±¸p"
 
+#~ msgid "/File/C_lear"
+#~ msgstr "/ÀÉ®×/²M°£ (&C)"
+
+#~ msgid "/File/_Open"
+#~ msgstr "/ÀÉ®×/¶}±Ò (&O)"
+
+#, fuzzy
+#~ msgid "/File/Save _As"
+#~ msgstr "/ÀÉ®×/Ãö³¬ (&C)"
+
+#~ msgid "/File/sep1"
+#~ msgstr "/ÀÉ®×/sep1"
+
+#~ msgid "/File/_Sign"
+#~ msgstr "/ÀÉ®×/Ã±¸p (&S)"
+
+#~ msgid "/File/_Verify"
+#~ msgstr "/ÀÉ®×/ÅçÃÒ (&V)"
+
+#~ msgid "/File/_Encrypt"
+#~ msgstr "/ÀÉ®×/¥[±K (&E)"
+
+#~ msgid "/File/_Decrypt"
+#~ msgstr "/ÀÉ®×/¸Ñ±K (&D)"
+
+#~ msgid "/File/sep2"
+#~ msgstr "/ÀÉ®×/sep2"
+
+#~ msgid "/File/_Close"
+#~ msgstr "/ÀÉ®×/Ãö³¬ (&C)"
+
+#~ msgid "/File/_Quit"
+#~ msgstr "/ÀÉ®×/Â÷¶} (&Q)"
+
+#, fuzzy
+#~ msgid "/Edit/_Undo"
+#~ msgstr "/½s¿è/½Æ»s (&C)"
+
+#, fuzzy
+#~ msgid "/Edit/_Redo"
+#~ msgstr "/½s¿è/½Æ»s (&C)"
+
+#, fuzzy
+#~ msgid "/Edit/sep0"
+#~ msgstr "/½s¿è/sep2"
+
+#, fuzzy
+#~ msgid "/Edit/Cut"
+#~ msgstr "/½s¿è/½Æ»s"
+
+#~ msgid "/Edit/_Copy"
+#~ msgstr "/½s¿è/½Æ»s (&C)"
+
+#~ msgid "/Edit/_Paste"
+#~ msgstr "/½s¿è/¶K¤W (&P)"
+
+#, fuzzy
+#~ msgid "/Edit/_Delete"
+#~ msgstr "/½s¿è/¶K¤W (&P)"
+
+#~ msgid "/Edit/sep1"
+#~ msgstr "/½s¿è/sep1"
+
+#~ msgid "/Edit/Select _All"
+#~ msgstr "/½s¿è/¥þ³¡¿ï¾Ü (&A)"
+
+#~ msgid "/Edit/sep2"
+#~ msgstr "/½s¿è/sep2"
+
+#~ msgid "/Edit/Pr_eferences..."
+#~ msgstr "/½s¿è/³]©w (&E)"
+
+#, fuzzy
+#~ msgid "/Edit/_Backend Preferences..."
+#~ msgstr "/½s¿è/³]©w (&E)"
+
+#~ msgid "/_Windows"
+#~ msgstr "/µøµ¡"
+
+#~ msgid "/Windows/_Keyring Editor"
+#~ msgstr "/µøµ¡/Æ_°é½s¿è¾¹ (&K)"
+
+#~ msgid "/Windows/_Filemanager"
+#~ msgstr "/µøµ¡/ÀÉ®×ºÞ²z (&F)"
+
+#~ msgid "/Edit/Copy"
+#~ msgstr "/½s¿è/½Æ»s"
+
+#, fuzzy
+#~ msgid "/Edit/Paste"
+#~ msgstr "/½s¿è/¶K¤W (&P)"
+
+#~ msgid "open file"
+#~ msgstr "¶}±ÒÀÉ®×"
+
+#, fuzzy
+#~ msgid "save file as"
+#~ msgstr "Ãö³¬ÀÉ®×"
+
+#, fuzzy
+#~ msgid "cut the selection"
+#~ msgstr "¥[±K¤w¿ï¾ÜÀÉ®×"
+
+#, fuzzy
+#~ msgid "copy the selection"
+#~ msgstr "¥[±K¤w¿ï¾ÜÀÉ®×"
+
+#, fuzzy
+#~ msgid "Sign the selected text"
+#~ msgstr "Ã±¸p¤w¿ï¾Üªº±KÆ_"
+
+#, fuzzy
+#~ msgid "verify text"
+#~ msgstr "ÅçÃÒÀÉ®×"
+
+#, fuzzy
+#~ msgid "encrypt text"
+#~ msgstr "¥[±KÀÉ®×"
+
+#, fuzzy
+#~ msgid "decrypt text"
+#~ msgstr "¸Ñ±KÀÉ®×"
+
+#~ msgid "preferences"
+#~ msgstr "³]©w"
+
+#, fuzzy
+#~ msgid "Open the keyring editor"
+#~ msgstr "¶}±ÒÆ_°é½s¿è¾¹ (¹w³])"
+
+#, fuzzy
+#~ msgid "keyring editor"
+#~ msgstr "Æ_°é½s¿è¾¹"
+
+#, fuzzy
+#~ msgid "Open the file manager"
+#~ msgstr "¶}±ÒÀÉ®×ºÞ²zû"
+
+#~ msgid "file manager"
+#~ msgstr "ÀÉ®×ºÞ²zû"
+
+#~ msgid "Help"
+#~ msgstr "¨D§U"
+
+#~ msgid "help"
+#~ msgstr "¨D§U"
+
+#~ msgid "/File/Sign"
+#~ msgstr "/ÀÉ®×/Ã±¸p"
+
+#~ msgid "/File/Verify"
+#~ msgstr "/ÀÉ®×/ÅçÃÒ"
+
+#~ msgid "/File/Encrypt"
+#~ msgstr "/ÀÉ®×/¥[±K"
+
+#~ msgid "/File/Decrypt"
+#~ msgstr "/ÀÉ®×/¸Ñ±K"
+
+#~ msgid "close files"
+#~ msgstr "Ãö³¬ÀÉ®×"
+
+#~ msgid "sign file"
+#~ msgstr "ÀÉ®×Ã±¸p"
+
+#~ msgid "verify file"
+#~ msgstr "ÅçÃÒÀÉ®×"
+
+#~ msgid "encrypt file"
+#~ msgstr "¥[±KÀÉ®×"
+
+#~ msgid "decrypt file"
+#~ msgstr "¸Ñ±KÀÉ®×"
+
+#, fuzzy
+#~ msgid "Open the clipboard"
+#~ msgstr "¶}±ÒÀÉ®×ºÞ²zû"
+
+#~ msgid "_Backup to file:"
+#~ msgstr "¿é¥X¦ÜÀÉ®× (&B):"
+
+#~ msgid "B_rowse..."
+#~ msgstr "ÂsÄý (&r)"
+
+#, fuzzy
+#~ msgid "_Back"
+#~ msgstr "/³Æ¥÷... (&B)"
+
+#~ msgid "Brought to you by:"
+#~ msgstr "¥Ñ¥LÌ±aµ¹±zªº¬O:"
+
+#, fuzzy
+#~ msgid "GPA is Free Software under the"
+#~ msgstr "GPA ¬O¦Û¥Ñ³n¥ó, ¨Ã¥H"
+
+#~ msgid "GNU General Public License."
+#~ msgstr "GNU ¤½²³³\¥iµý"
+
+#~ msgid "For news see:"
+#~ msgstr "·s»D¤§¥Î:"
+
+#, fuzzy
+#~ msgid "http://www.gpg4win.org"
+#~ msgstr "http://www.gnupg.org"
+
+#~ msgid "http://www.gnupg.org"
+#~ msgstr "http://www.gnupg.org"
+
+#, fuzzy
+#~ msgid "GNU General Public License"
+#~ msgstr "GNU ¤½²³³\¥iµý"
+
+#, fuzzy
+#~ msgid "_GNU General Public License"
+#~ msgstr "GNU ¤½²³³\¥iµý"
+
+#~ msgid "Show Help Text\n"
+#~ msgstr "Åã¥Ü¨D§U¤å¦r\n"
+
+#~ msgid "/_Help"
+#~ msgstr "/¨D§U"
+
+#~ msgid "/Help/_Contents"
+#~ msgstr "/¨D§U/¤º®e (&L)"
+
+#~ msgid "/Help/_License"
+#~ msgstr "/¨D§U/³\¥iµý (&L)"
+
+#~ msgid "/Help/_About"
+#~ msgstr "/¨D§U/Ãö©ó (&A)"
+
+#~ msgid "Please insert your name"
+#~ msgstr "½Ð¿é¤J±zªº¦W¦r"
+
+#~ msgid "Please insert your email address"
+#~ msgstr "½Ð¿é¤J±zªº¹q©Ò¦a§}"
+
+#, fuzzy
+#~ msgid "/Keys/sep0"
+#~ msgstr "/Æ_¹ï/sep1"
+
+#~ msgid "/Keys/_Delete Keys..."
+#~ msgstr "/Æ_¹ï/§R°£·sÆ_... (&D)"
+
+#~ msgid "/Keys/sep1"
+#~ msgstr "/Æ_¹ï/sep1"
+
+#~ msgid "/Keys/_Sign Keys..."
+#~ msgstr "/Æ_¹ï/Ã±¸p¤½Æ_... (&S)"
+
+#~ msgid "/Keys/Set _Owner Trust..."
+#~ msgstr "/Æ_¹ï/§ïÅÜ«H¥ô«×... (&O)"
+
+#~ msgid "/Keys/_Edit Private Key..."
+#~ msgstr "/Æ_¹ï/×§ï±KÆ_... (&E)"
+
+#~ msgid "/Keys/sep2"
+#~ msgstr "/Æ_¹ï/sep2"
+
+#~ msgid "/Keys/_Import Keys..."
+#~ msgstr "/Æ_¹ï/¶×¤JÆ_¹ï... (&I)"
+
+#~ msgid "/Keys/E_xport Keys..."
+#~ msgstr "/Æ_¹ï/¶×¥XÆ_¹ï... (&X)"
+
+#~ msgid "/Keys/_Backup..."
+#~ msgstr "/Æ_¹ï/³Æ¥÷... (&B)"
+
+#~ msgid "/Server/_Send Keys..."
+#~ msgstr "/¦øªA¾¹/¤W¶Ç¤½Æ_... (&S)"
+
+#, fuzzy
+#~ msgid "/Windows/_File Manager"
+#~ msgstr "/µøµ¡/ÀÉ®×ºÞ²z (&F)"
+
+#~ msgid "/Keys/Export Keys..."
+#~ msgstr "/Æ_¹ï/¶×¥XÆ_¹ï..."
+
+#~ msgid "/Keys/Delete Keys..."
+#~ msgstr "/Æ_¹ï/«Ø¥ß·sÆ_... (&G)"
+
+#~ msgid "/Server/Send Keys..."
+#~ msgstr "/¦øªA¾¹/¤W¶Ç¤½Æ_..."
+
+#~ msgid "/Keys/Set Owner Trust..."
+#~ msgstr "/Æ_¹ï/§ïÅÜ«H¥ô«×..."
+
+#~ msgid "/Keys/Sign Keys..."
+#~ msgstr "/Æ_¹ï/Ã±¸p¤½Æ_..."
+
+#~ msgid "/Keys/Edit Private Key..."
+#~ msgstr "/Æ_¹ï/×§ï±KÆ_..."
+
+#~ msgid "/Keys/Backup..."
+#~ msgstr "/Æ_¹ï/³Æ¥÷..."
+
+#~ msgid "/_Copy"
+#~ msgstr "/½Æ»s (&C)"
+
+#~ msgid "/_Paste"
+#~ msgstr "/¶K¤W (&P)"
+
+#~ msgid "/Set Owner Trust..."
+#~ msgstr "/³]©w«H¥ô«×..."
+
+#~ msgid "/Sign Keys..."
+#~ msgstr "/Ã±¸p¤½Æ_..."
+
+#~ msgid "/Edit Private Key..."
+#~ msgstr "/×§ï¨pÆ_..."
+
+#~ msgid "/Backup..."
+#~ msgstr "/³Æ¥÷..."
+
+#~ msgid "edit key"
+#~ msgstr "×§ï±KÆ_"
+
+#~ msgid "remove key"
+#~ msgstr "²¾°£±KÆ_"
+
+#~ msgid "sign key"
+#~ msgstr "Ã±¸p±KÆ_"
+
+#~ msgid "import keys"
+#~ msgstr "¶×¤J±KÆ_"
+
+#~ msgid "export keys"
+#~ msgstr "¿é¥X±KÆ_"
+
+#~ msgid "brief"
+#~ msgstr "ºKn"
+
+#~ msgid "detailed"
+#~ msgstr "¸Ô±¡"
+
+#~ msgid "Settings"
+#~ msgstr "³]©w"
+
 #~ msgid "Sign files"
 #~ msgstr "Ã±¸pÀÉ®×"
 

Modified: trunk/src/keyring.c
===================================================================
--- trunk/src/keyring.c	2008-05-08 12:08:55 UTC (rev 890)
+++ trunk/src/keyring.c	2008-05-08 12:53:41 UTC (rev 891)
@@ -888,7 +888,7 @@
 
       /* File menu.  */
       { "FileClose", GTK_STOCK_CLOSE, NULL, NULL,
-	N_("FIXME"), G_CALLBACK (keyring_editor_close) },
+	"FIXME", G_CALLBACK (keyring_editor_close) },
       { "FileQuit", GTK_STOCK_QUIT, NULL, NULL,
 	N_("Quit the program"), G_CALLBACK (gtk_main_quit) },
 

