[Gpa-commits] r859 - trunk/po

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Thu Mar 20 22:40:37 CET 2008


Author: marcus
Date: 2008-03-20 22:40:36 +0100 (Thu, 20 Mar 2008)
New Revision: 859

Modified:
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/po/ar.po
   trunk/po/es.po
   trunk/po/fr.po
   trunk/po/ru.po
Log:
2008-03-20  Marcus Brinkmann  <marcus at g10code.de>

	* ar.po, es.po, fr.po, ru.po: Updates from Alberto
	Escudero-Pascual.
	* POTFILES.in: Remove src/gpa_license.c.


Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog	2008-03-19 03:36:16 UTC (rev 858)
+++ trunk/po/ChangeLog	2008-03-20 21:40:36 UTC (rev 859)
@@ -1,3 +1,9 @@
+2008-03-20  Marcus Brinkmann  <marcus at g10code.de>
+
+	* ar.po, es.po, fr.po, ru.po: Updates from Alberto
+	Escudero-Pascual.
+	* POTFILES.in: Remove src/gpa_license.c.
+
 2008-03-12  Werner Koch  <wk at g10code.com>
 
 	* ru.po, fr.po, ar.po, es.po: Fixed fuzzies for command line options.

Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in	2008-03-19 03:36:16 UTC (rev 858)
+++ trunk/po/POTFILES.in	2008-03-20 21:40:36 UTC (rev 859)
@@ -31,7 +31,6 @@
 src/gpakeyselector.c
 src/gpakeysignop.c
 src/gpakeytrustop.c
-src/gpa_license.c
 src/gpaoperation.c
 src/gpapastrings.c
 src/gpaprogressdlg.c

Modified: trunk/po/ar.po
===================================================================
--- trunk/po/ar.po	2008-03-19 03:36:16 UTC (rev 858)
+++ trunk/po/ar.po	2008-03-20 21:40:36 UTC (rev 859)
@@ -1,317 +1,316 @@
 # translation of GPA to Arabic
 # This file is put in the public domain.
 #
-# Khaled Hosny <khaledhosny at eglug.org>, 2008
-# Ahmad Gharbeia <gharbeia at gmail.com>, 2008
+# Khaled Hosny <khaledhosny at eglug.org>, 2008.
+# Ahmad Gharbeia <gharbeia at gmail.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: GPA\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:33+0100\n"
-"Last-Translator: Ahmad Gharbeia أحمد غربية <gharbeia at gmail.com>\n"
+"POT-Creation-Date: 2008-03-20 22:28+0100\n"
+"PO-Revision-Date: 2008-03-17 13:05+0100\n"
+"Last-Translator: \n"
 "Language-Team: Arabic <doc at arabeyes.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
-"X-Generator: KBabel 1.11.4\n"
 
-#: src/clipboard.c:367 src/fileman.c:350
+#: src/clipboard.c:381 src/fileman.c:393
 msgid "Open File"
 msgstr "افتح ملفا"
 
-#: src/clipboard.c:395 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:409 src/confdialog.c:1266 src/gtktools.c:353
 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:426
 #, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
 msgstr "الملف %s حجمه %lli%s.  أتريد حقا فتحه؟"
 
-#: src/clipboard.c:481
+#: src/clipboard.c:547
 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/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
 msgid "Clipboard"
 msgstr "الحافظة"
 
-#: src/clipboard.c:692 src/fileman.c:472 src/keyring.c:863
+#: src/clipboard.c:758 src/fileman.c:513 src/keyring.c:863
 msgid "/_File"
 msgstr "/_ملف"
 
-#: src/clipboard.c:693 src/fileman.c:474
+#: src/clipboard.c:759 src/fileman.c:515
 msgid "/File/C_lear"
 msgstr "/ملف/ا_مسح"
 
-#: src/clipboard.c:694 src/fileman.c:473
+#: src/clipboard.c:760 src/fileman.c:514
 msgid "/File/_Open"
 msgstr "/ملف/_افتح"
 
-#: src/clipboard.c:695
+#: src/clipboard.c:761
 msgid "/File/Save _As"
 msgstr "/ملف/احفظ _باسم"
 
-#: src/clipboard.c:697 src/fileman.c:475
+#: src/clipboard.c:763 src/fileman.c:516
 msgid "/File/sep1"
 msgstr "/ملف/sep1"
 
-#: src/clipboard.c:698 src/fileman.c:476
+#: src/clipboard.c:764 src/fileman.c:517
 msgid "/File/_Sign"
 msgstr "/ملف/_وقّع"
 
-#: src/clipboard.c:699 src/fileman.c:477
+#: src/clipboard.c:765 src/fileman.c:518
 msgid "/File/_Verify"
 msgstr "/ملف/_تحقق"
 
-#: src/clipboard.c:700 src/fileman.c:478
+#: src/clipboard.c:766 src/fileman.c:519
 msgid "/File/_Encrypt"
 msgstr "/ملف/_عمّ"
 
-#: src/clipboard.c:701 src/fileman.c:479
+#: src/clipboard.c:767 src/fileman.c:520
 msgid "/File/_Decrypt"
 msgstr "/ملف/_ظهِّر"
 
-#: src/clipboard.c:702 src/fileman.c:480
+#: src/clipboard.c:768 src/fileman.c:521
 msgid "/File/sep2"
 msgstr "/ملف/sep2"
 
-#: src/clipboard.c:703 src/fileman.c:481 src/keyring.c:864
+#: src/clipboard.c:769 src/fileman.c:522 src/keyring.c:864
 msgid "/File/_Close"
 msgstr "/ملف/أ_غلق"
 
-#: src/clipboard.c:704 src/fileman.c:482 src/keyring.c:866
+#: src/clipboard.c:770 src/fileman.c:523 src/keyring.c:866
 msgid "/File/_Quit"
 msgstr "/ملف/ا_خرج"
 
-#: src/clipboard.c:707 src/fileman.c:485 src/keyring.c:869
+#: src/clipboard.c:773 src/fileman.c:526 src/keyring.c:869
 msgid "/_Edit"
 msgstr "/_تحرير"
 
-#: src/clipboard.c:710
+#: src/clipboard.c:776
 msgid "/Edit/_Undo"
 msgstr "/تحرير/_تراجع"
 
-#: src/clipboard.c:711
+#: src/clipboard.c:777
 msgid "/Edit/_Redo"
 msgstr "/تحرير/أ_عِد"
 
-#: src/clipboard.c:712
+#: src/clipboard.c:778
 msgid "/Edit/sep0"
 msgstr "/تحرير/sep0"
 
-#: src/clipboard.c:714 src/clipboard.c:750
+#: src/clipboard.c:780 src/clipboard.c:816
 msgid "/Edit/Cut"
 msgstr "/تحرير/قص"
 
-#: src/clipboard.c:715 src/keyring.c:870
+#: src/clipboard.c:781 src/keyring.c:870
 msgid "/Edit/_Copy"
 msgstr "/تحرير/ا_نسخ"
 
-#: src/clipboard.c:716 src/keyring.c:872
+#: src/clipboard.c:782 src/keyring.c:872
 msgid "/Edit/_Paste"
 msgstr "/تحرير/ا_لصق"
 
-#: src/clipboard.c:717
+#: src/clipboard.c:783
 msgid "/Edit/_Delete"
 msgstr "/تحرير/ا_حذف"
 
-#: src/clipboard.c:718 src/keyring.c:874
+#: src/clipboard.c:784 src/keyring.c:874
 msgid "/Edit/sep1"
 msgstr "/تحرير/sep1"
 
-#: src/clipboard.c:719 src/fileman.c:486 src/keyring.c:875
+#: src/clipboard.c:785 src/fileman.c:527 src/keyring.c:875
 msgid "/Edit/Select _All"
 msgstr "/تحرير/ا_ختر الكل"
 
-#: src/clipboard.c:721 src/fileman.c:487 src/keyring.c:876
+#: src/clipboard.c:787 src/fileman.c:528 src/keyring.c:876
 msgid "/Edit/sep2"
 msgstr "/تحرير/sep2"
 
-#: src/clipboard.c:722 src/fileman.c:488 src/keyring.c:877
+#: src/clipboard.c:788 src/fileman.c:529 src/keyring.c:877
 msgid "/Edit/Pr_eferences..."
 msgstr "/تحرير/ال_تفضيلات..."
 
-#: src/clipboard.c:724 src/fileman.c:490 src/keyring.c:879
+#: src/clipboard.c:790 src/fileman.c:531 src/keyring.c:879
 msgid "/Edit/_Backend Preferences..."
 msgstr "/تحرير/تفضيلات ال_خلفية..."
 
-#: src/clipboard.c:728 src/fileman.c:494 src/keyring.c:906
+#: src/clipboard.c:794 src/fileman.c:535 src/keyring.c:906
 msgid "/_Windows"
 msgstr "/_نوافذ"
 
-#: src/clipboard.c:729 src/fileman.c:495 src/keyring.c:907
+#: src/clipboard.c:795 src/fileman.c:536 src/keyring.c:907
 msgid "/Windows/_Keyring Editor"
 msgstr "/نوافذ/_محرر حلقة المفاتيح"
 
-#: src/clipboard.c:730 src/fileman.c:496
+#: src/clipboard.c:796 src/fileman.c:537
 msgid "/Windows/_Filemanager"
 msgstr "/نوافذ/_مدير الملفات"
 
-#: src/clipboard.c:731 src/fileman.c:497 src/keyring.c:909
+#: src/clipboard.c:797 src/fileman.c:538 src/keyring.c:909
 msgid "/Windows/_Clipboard"
 msgstr "/نوافذ/ال_حافظة"
 
-#: src/clipboard.c:758 src/keyring.c:948
+#: src/clipboard.c:824 src/keyring.c:948
 msgid "/Edit/Copy"
 msgstr "/تحرير/انسخ"
 
-#: src/clipboard.c:766
+#: src/clipboard.c:832
 msgid "/Edit/Delete"
 msgstr "/تحرير/احذف"
 
-#: src/clipboard.c:774
+#: src/clipboard.c:840
 msgid "/Edit/Paste"
-msgstr "/تحرير/الصق"
+msgstr "/تحرير/ألصق"
 
-#: src/clipboard.c:879
+#: src/clipboard.c:945
 msgid "Clear buffer"
 msgstr "يخلي البراح"
 
-#: src/clipboard.c:879
+#: src/clipboard.c:945
 msgid "clear buffer"
 msgstr "أخل البراح"
 
-#: src/clipboard.c:887 src/fileman.c:602
+#: src/clipboard.c:953 src/fileman.c:643
 msgid "Open a file"
 msgstr "يفتح ملفا"
 
-#: src/clipboard.c:887 src/fileman.c:602
+#: src/clipboard.c:953 src/fileman.c:643
 msgid "open file"
 msgstr "افتح ملفا"
 
-#: src/clipboard.c:892
+#: src/clipboard.c:958
 msgid "Save to a file"
 msgstr "يحفظ في ملف"
 
-#: src/clipboard.c:892
+#: src/clipboard.c:958
 msgid "save file as"
 msgstr "احفظ الملف باسم"
 
-#: src/clipboard.c:900
+#: src/clipboard.c:966
 msgid "Cut the selection"
 msgstr "يقص المحدد إلى الحافظة"
 
-#: src/clipboard.c:901
+#: src/clipboard.c:967
 msgid "cut the selection"
 msgstr "قص المحدد"
 
-#: src/clipboard.c:907
+#: src/clipboard.c:973
 msgid "Copy the selection"
 msgstr "ينسخ المحدد"
 
-#: src/clipboard.c:908
+#: src/clipboard.c:974
 msgid "copy the selection"
 msgstr "انسخ المحدد"
 
-#: src/clipboard.c:914
+#: src/clipboard.c:980
 msgid "Paste the clipboard"
 msgstr "يلصق ما في الحافظة"
 
-#: src/clipboard.c:915
+#: src/clipboard.c:981
 msgid "paste the clipboard"
 msgstr "ألصق الحافظة"
 
-#: src/clipboard.c:925 src/fileman.c:612 src/keyring.c:1570
+#: src/clipboard.c:991 src/fileman.c:653 src/keyring.c:1570
 msgid "Sign"
 msgstr "وقّع"
 
-#: src/clipboard.c:926
+#: src/clipboard.c:992
 msgid "Sign the selected text"
 msgstr "يوقّع النصَ المحدد"
 
-#: src/clipboard.c:927
+#: src/clipboard.c:993
 msgid "sign text"
 msgstr "وقّع النصّ"
 
-#: src/clipboard.c:935 src/fileman.c:623
+#: src/clipboard.c:1001 src/fileman.c:664
 msgid "Verify"
 msgstr "تحقق"
 
-#: src/clipboard.c:936
+#: src/clipboard.c:1002
 msgid "Check signatures of selected text"
 msgstr "يتحقَّق من توقيعات النصّ المحدد"
 
-#: src/clipboard.c:937
+#: src/clipboard.c:1003
 msgid "verify text"
 msgstr "تحقق من النصّ"
 
-#: src/clipboard.c:945 src/fileman.c:634
+#: src/clipboard.c:1011 src/fileman.c:675
 msgid "Encrypt"
 msgstr "عمّ"
 
-#: src/clipboard.c:946
+#: src/clipboard.c:1012
 msgid "Encrypt the selected text"
 msgstr "يعمّي النصّ المحدد"
 
-#: src/clipboard.c:947
+#: src/clipboard.c:1013
 msgid "encrypt text"
 msgstr "عمّ النصّ"
 
-#: src/clipboard.c:955 src/fileman.c:645
+#: src/clipboard.c:1021 src/fileman.c:686
 msgid "Decrypt"
 msgstr "ظهِّر"
 
-#: src/clipboard.c:956
+#: src/clipboard.c:1022
 msgid "Decrypt the selected text"
 msgstr "يظهِّر النصّ المحدد"
 
-#: src/clipboard.c:957
+#: src/clipboard.c:1023
 msgid "decrypt text"
 msgstr "ظهِّر النصّ"
 
-#: src/clipboard.c:967 src/fileman.c:658 src/keyring.c:1631
+#: src/clipboard.c:1033 src/fileman.c:699 src/keyring.c:1631
 msgid "Open the preferences dialog"
 msgstr "يفتح حوار التفضيلات"
 
-#: src/clipboard.c:968 src/fileman.c:659 src/keyring.c:1632
+#: src/clipboard.c:1034 src/fileman.c:700 src/keyring.c:1632
 msgid "preferences"
 msgstr "التفضيلات"
 
-#: src/clipboard.c:975 src/fileman.c:666
+#: src/clipboard.c:1041 src/fileman.c:707
 msgid "Keyring"
 msgstr "حلقة مفاتيح"
 
-#: src/clipboard.c:976 src/fileman.c:667
+#: src/clipboard.c:1042 src/fileman.c:708
 msgid "Open the keyring editor"
 msgstr "يفتح محرر حلقة المفاتيح"
 
-#: src/clipboard.c:977 src/fileman.c:668
+#: src/clipboard.c:1043 src/fileman.c:709
 msgid "keyring editor"
 msgstr "محرر حلقة المفاتيح"
 
-#: src/clipboard.c:983 src/keyring.c:1648
+#: src/clipboard.c:1049 src/keyring.c:1648
 msgid "Files"
 msgstr "ملفات"
 
-#: src/clipboard.c:984 src/keyring.c:1649
+#: src/clipboard.c:1050 src/keyring.c:1649
 msgid "Open the file manager"
 msgstr "يفتح مدير الملفات"
 
-#: src/clipboard.c:985 src/keyring.c:1650
+#: src/clipboard.c:1051 src/keyring.c:1650
 msgid "file manager"
 msgstr "مدير الملفات"
 
-#: src/clipboard.c:992 src/fileman.c:684 src/keyring.c:1665
+#: src/clipboard.c:1058 src/fileman.c:725 src/keyring.c:1665
 msgid "Help"
 msgstr "مساعدة"
 
-#: src/clipboard.c:993 src/fileman.c:685 src/keyring.c:1666
+#: src/clipboard.c:1059 src/fileman.c:726 src/keyring.c:1666
 msgid "Understanding the GNU Privacy Assistant"
 msgstr "شرح مساعد خصوصية جنو"
 
-#: src/clipboard.c:994 src/fileman.c:686 src/keyring.c:1667
+#: src/clipboard.c:1060 src/fileman.c:727 src/keyring.c:1667
 msgid "help"
 msgstr "مساعدة"
 
-#: src/clipboard.c:1084
+#: src/clipboard.c:1150
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "مساعد خصوصية جنو - الحافظة"
 
@@ -380,15 +379,15 @@
 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
+#: 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
 msgid "Encrypt documents"
-msgstr "عمّ الوثايقة"
+msgstr "عمّ الوثيقة"
 
 #: src/encryptdlg.c:174
 msgid "_Public Keys"
@@ -422,86 +421,86 @@
 msgid "_expire on:"
 msgstr "ت_نتهي في:"
 
-#: src/fileman.c:355 src/fileman.c:953
-msgid "The file is already open."
-msgstr "الملفّ مفتوح بالفعل."
-
-#: src/fileman.c:516
+#: src/fileman.c:557
 msgid "/File/Sign"
 msgstr "/ملف/وقّع"
 
-#: src/fileman.c:521
+#: src/fileman.c:562
 msgid "/File/Verify"
 msgstr "/ملف/تحقق"
 
-#: src/fileman.c:526
+#: src/fileman.c:567
 msgid "/File/Encrypt"
 msgstr "/ملف/عمّ"
 
-#: src/fileman.c:531
+#: src/fileman.c:572
 msgid "/File/Decrypt"
 msgstr "/ملف/استخرج"
 
-#: src/fileman.c:606
+#: src/fileman.c:647
 msgid "Close all files"
 msgstr "أغلق كل الملفات"
 
-#: src/fileman.c:606
+#: src/fileman.c:647
 msgid "close files"
 msgstr "أغلق الملفات"
 
-#: src/fileman.c:613
+#: src/fileman.c:654
 msgid "Sign the selected file"
 msgstr "يوقّع الملف المُحدد"
 
-#: src/fileman.c:614
+#: src/fileman.c:655
 msgid "sign file"
 msgstr "وقع ملفّا"
 
-#: src/fileman.c:624
+#: src/fileman.c:665
 msgid "Check signatures of selected file"
 msgstr "يتحقّق من توقيعات الملف المحدد"
 
-#: src/fileman.c:625
+#: src/fileman.c:666
 msgid "verify file"
 msgstr "تحقق من الملفّ"
 
-#: src/fileman.c:635
+#: src/fileman.c:676
 msgid "Encrypt the selected file"
 msgstr "يعمّي الملف المحدد"
 
-#: src/fileman.c:636
+#: src/fileman.c:677
 msgid "encrypt file"
 msgstr "عمّ الملفّ"
 
-#: src/fileman.c:646
+#: src/fileman.c:687
 msgid "Decrypt the selected file"
 msgstr "يظهِّر الملف المحدد"
 
-#: src/fileman.c:647
+#: src/fileman.c:688
 msgid "decrypt file"
 msgstr "استخرج الملفّ"
 
-#: src/fileman.c:676 src/keyring.c:1658
+#: src/fileman.c:717 src/keyring.c:1658
 msgid "Open the clipboard"
 msgstr "يفتح الحافظة"
 
-#: src/fileman.c:677 src/keyring.c:1659
+#: src/fileman.c:718 src/keyring.c:1659
 msgid "clipboard"
 msgstr "الحافظة"
 
-#: src/fileman.c:785
+#: src/fileman.c:826
 msgid "File"
 msgstr "ملف"
 
-#: src/fileman.c:850
+#: src/fileman.c:891
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "مساعد خصوصية جنو - مدير الملفات"
 
-#: src/fileman.c:876
+#: src/fileman.c:917
 msgid "File Manager"
 msgstr "مدير الملفات"
 
+#: src/fileman.c:993
+msgid "The file is already open."
+msgstr "الملفّ مفتوح بالفعل."
+
 #: src/filesigndlg.c:134
 msgid "Sign documents"
 msgstr "وقّع الملفات"
@@ -522,32 +521,9 @@
 msgid "_detached signature"
 msgstr "توقيع  _منفصِل"
 
-#: 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 "_نعم"
-
-#: 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 "_لا"
-
-#: src/gpabackupop.c:229
-#, c-format
-msgid ""
 "A copy of your secret key has been made to the file:\n"
 "\n"
 "\t\"%s\"\n"
@@ -562,31 +538,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 "ا_حفظ احتياطيا في ملفّ:"
-
-#: src/gpabackupop.c:329
-msgid "B_rowse..."
-msgstr "_تصفّح..."
-
 #: src/gpa.c:92
 msgid "Output version information and exit"
 msgstr "اعرض معلومات الإصدارة واخرج"
@@ -605,7 +569,7 @@
 
 #: src/gpa.c:100
 msgid "Start only the UI server (implies --cms)"
-msgstr "ابدأ فقط خادوم واجهة المستخدم"
+msgstr "ابدأ فقط خادوم واجهة المستخدم (يفترض ‪--cmss‬ أيضا)"
 
 #: src/gpa.c:102
 msgid "Read options from file"
@@ -627,15 +591,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 "_درّْع"
 
-#: src/gpaexportfileop.c:171
+#: src/gpaexportfileop.c:182
 #, c-format
 msgid "The keys have been exported to %s."
 msgstr "تم تصدير المفاتيح إلى %s."
@@ -651,6 +615,18 @@
 "خادوم مفاتيح علني (\"%s\").\n"
 "أمتأكد أنك تريد توزيع هذا المفتاح؟"
 
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:455
+#: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
+#: src/keydeletedlg.c:93 src/keysigndlg.c:62 src/settingsdlg.c:165
+msgid "_Yes"
+msgstr "_نعم"
+
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:456
+#: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
+#: src/keydeletedlg.c:95 src/keysigndlg.c:64 src/settingsdlg.c:168
+msgid "_No"
+msgstr "_لا"
+
 #: src/gpaexportserverop.c:187
 msgid "The keys have been sent to the server."
 msgstr "أُرسلت المفاتيح إلى الخادوم."
@@ -679,8 +655,8 @@
 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/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
 msgid "Wrong passphrase!"
 msgstr "عبارة السر خطأ."
@@ -710,7 +686,7 @@
 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/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:436
 #: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
 msgid "_Close"
 msgstr "أ_غلق"
@@ -728,7 +704,14 @@
 msgid "The following key expired on %s:"
 msgstr "انتهت صلاحية هذا المفتاح في %s:"
 
-#: src/gpafileencryptop.c:641 src/gpafilesignop.c:414
+#: src/gpafileencryptop.c:596 src/gpafilesignop.c:429
+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
 msgid "You didn't select any key for signing"
 msgstr "لم تحدد مفتاحا للتوقيع"
 
@@ -736,13 +719,6 @@
 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 "يجري التحقق..."
@@ -763,7 +739,7 @@
 msgid "Generating Key..."
 msgstr "يجري توليد المفتاح..."
 
-#: src/gpaimportfileop.c:131
+#: src/gpaimportfileop.c:132
 msgid "Import public keys from file"
 msgstr "استورد المفاتيح العلنية من ملفّ"
 
@@ -890,16 +866,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:830
+#: src/gpgmetools.c:949
 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:945
 msgid "Expired"
 msgstr "منتهية صلاحيته"
 
-#: src/gpasubkeylist.c:145 src/gpgmetools.c:617
+#: src/gpasubkeylist.c:145 src/gpgmetools.c:626
 msgid "Disabled"
 msgstr "معطل"
 
@@ -907,11 +883,11 @@
 msgid "Unsigned"
 msgstr "غير موقّع"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:927 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:936 src/verifydlg.c:212
 msgid "Valid"
 msgstr "صالح"
 
-#: src/gpawidgets.c:72 src/gpgmetools.c:661 src/gpgmetools.c:668
+#: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
 #: src/keyring.c:1176 src/keysigndlg.c:104
 msgid "User Name:"
 msgstr "اسم المستخدم:"
@@ -920,28 +896,28 @@
 msgid "User Names:"
 msgstr "أسماء المستخدم:"
 
-#: src/gpawidgets.c:78 src/gpgmetools.c:662 src/gpgmetools.c:669
+#: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
 #: src/keyring.c:1178
 msgid "Key ID:"
 msgstr "معرِّف المفتاح:"
 
-#: src/gpawidgets.c:194
+#: src/gpawidgets.c:180
 msgid "Expiration"
 msgstr "انتهاء الصلاحية"
 
-#: src/gpawidgets.c:201
+#: src/gpawidgets.c:187
 msgid "_indefinitely valid"
-msgstr "_صالح بلا تحديد"
+msgstr "_صالح بلا نهاية"
 
-#: src/gpawidgets.c:210
+#: src/gpawidgets.c:196
 msgid "expire _after"
 msgstr "ينتهي _بعد"
 
-#: src/gpawidgets.c:229
+#: src/gpawidgets.c:216
 msgid "expire o_n:"
 msgstr "ينتهي _في:"
 
-#: src/gpawidgets.c:302 src/keygendlg.c:295
+#: src/gpawidgets.c:292 src/keygendlg.c:295
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -996,8 +972,17 @@
 "في الأغلب هذه علّة في GPA.\n"
 "سيُحاول 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 ""
+"الملفّ %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"
@@ -1010,7 +995,7 @@
 "************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:482
+#: src/gpgmetools.c:491
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -1018,119 +1003,119 @@
 "المفتاح المحفوظ احتياطيا في هذا الملف هو:\n"
 "\n"
 
-#: src/gpgmetools.c:543
+#: src/gpgmetools.c:552
 msgid "DSA and ElGamal (default)"
 msgstr "‏DSA و الجمل (البدئي)"
 
-#: 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:941 src/gpgmetools.c:974
 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:823
 msgid "[None]"
-msgstr "[لاشيئ]"
+msgstr "[لاشيء]"
 
-#: src/gpgmetools.c:904 src/verifydlg.c:269
+#: src/gpgmetools.c:913 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[هوية مستخدم مجهولة]"
 
-#: src/gpgmetools.c:930 src/verifydlg.c:217
+#: src/gpgmetools.c:939 src/verifydlg.c:217
 msgid "Bad"
 msgstr "سيئ"
 
-#: src/gpgmetools.c:953
+#: src/gpgmetools.c:962
 msgid "Generic"
 msgstr "عام"
 
-#: src/gpgmetools.c:956
+#: src/gpgmetools.c:965
 msgid "Persona"
 msgstr "شخصي"
 
-#: src/gpgmetools.c:959
+#: src/gpgmetools.c:968
 msgid "Casual"
 msgstr "عادي"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:971
 msgid "Positive"
 msgstr "إيجابي"
 
-#: src/gpgmetools.c:980
+#: src/gpgmetools.c:989
 msgid "The key can be used for certification, signing and encryption."
 msgstr "يمكن استخدام المفتاح في الشهادة و التوقيع و التعمية."
 
-#: src/gpgmetools.c:983
+#: src/gpgmetools.c:992
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr "يمكن استخدام المفتاح في الشهادة و التوقيع لكن ليس في التعمية."
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:998
 msgid "The key can be used for certification and encryption."
 msgstr "يمكن استخدام المفتاح في الشهادة و التعمية."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:1001
 msgid "The key can be used only for certification."
 msgstr "يمكن استخدام المفتاح في الشهادة فقط."
 
-#: src/gpgmetools.c:1000
+#: src/gpgmetools.c:1009
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
 msgstr "يمكن استخدام المفتاح في التوقيع و التعمية لكن ليس في الشهادة."
 
-#: src/gpgmetools.c:1003
+#: src/gpgmetools.c:1012
 msgid "The key can be used only for signing."
 msgstr "يمكن استخدام المفتاح في التوقيع فقط."
 
-#: src/gpgmetools.c:1008
+#: src/gpgmetools.c:1017
 msgid "The key can be used only for encryption."
 msgstr "يمكن استخدام المفتاح في التعمية فقط."
 
-#: src/gpgmetools.c:1011
+#: src/gpgmetools.c:1020
 msgid "This key is useless."
 msgstr "لا فائدة لهذا المفتاح."
 
@@ -1138,59 +1123,59 @@
 msgid "GPA Error"
 msgstr "عطل في GPA"
 
-#: src/helpmenu.c:202
+#: src/helpmenu.c:216
 msgid "About GPA"
 msgstr "عنْ GPA"
 
-#: src/helpmenu.c:247
+#: src/helpmenu.c:261
 msgid "Brought to you by:"
 msgstr "قدّمه لك:"
 
-#: src/helpmenu.c:284
+#: src/helpmenu.c:298
 msgid "GPA is Free Software under the"
 msgstr "‏GPA برمجية حرّة تحت"
 
-#: src/helpmenu.c:288
+#: src/helpmenu.c:302
 msgid "GNU General Public License."
 msgstr "رخصة جنو العمومية العامة."
 
-#: src/helpmenu.c:292
+#: src/helpmenu.c:306
 msgid "For news see:"
 msgstr "للأخبار راجع:"
 
-#: src/helpmenu.c:297
+#: src/helpmenu.c:311
 msgid "http://www.gpg4win.org"
 msgstr "http://www.gpg4win.org"
 
-#: src/helpmenu.c:299
+#: src/helpmenu.c:313
 msgid "http://www.gnupg.org"
 msgstr "http://www.gnupg.org"
 
-#: src/helpmenu.c:382
+#: src/helpmenu.c:396
 msgid "GNU General Public License"
 msgstr "رخصة جنو العمومية العامة"
 
-#: src/helpmenu.c:409
+#: src/helpmenu.c:423
 msgid "_GNU General Public License"
 msgstr "رخصة _جنو العمومية العامة"
 
-#: src/helpmenu.c:436
+#: src/helpmenu.c:450
 msgid "Show Help Text\n"
 msgstr "اعرض نص المساعدة\n"
 
-#: src/helpmenu.c:444
+#: src/helpmenu.c:458
 msgid "/_Help"
 msgstr "/_مساعدة"
 
-#: src/helpmenu.c:446
+#: src/helpmenu.c:460
 msgid "/Help/_Contents"
 msgstr "/مساعدة/ال_محتويات"
 
-#: src/helpmenu.c:449
+#: src/helpmenu.c:463
 msgid "/Help/_License"
 msgstr "/مساعدة/ال_رخصة"
 
-#: src/helpmenu.c:450
+#: src/helpmenu.c:464
 msgid "/Help/_About"
 msgstr "/مساعدة/_عنْ"
 
@@ -1232,8 +1217,8 @@
 "although you may be able to get a new copy  from the owner or from a key "
 "server."
 msgstr ""
-"هذا مفتاح علني. لا يمكن التراجع عن حذف هذا المفتاح بسهولة، بالرغم من أنه "
-"بوسعك الحصول على نسخة جديدة من المالك أو من خادوم مفاتيح."
+"هذا مفتاح علني. لا يمكن التراجع عن حذف هذا المفتاح بسهولة، إلا أنك بوسعك "
+"الحصول على نسخة جديدة من المالك أو من خادوم مفاتيح."
 
 #: src/keydeletedlg.c:132
 msgid "Are you sure you want to delete this key?"
@@ -1253,7 +1238,7 @@
 
 #: src/keygendlg.c:58
 msgid "You must enter a User ID."
-msgstr ""
+msgstr "يجب أن تُدخِل هوية مُستخدم."
 
 #: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
 msgid ""
@@ -1442,11 +1427,11 @@
 
 #: src/keylist.c:568
 msgid "The key ID is a short number to identify a certificate."
-msgstr ""
+msgstr "مُعرّف المفتاح هو رقم صغير لتعريف الشهادة."
 
 #: src/keylist.c:581
 msgid "The Expiry Date is the date until the certificate is valid."
-msgstr ""
+msgstr "تاريخ الانتهاء هو التاريخ الذي تنتهي عنده صلاحية الشهادة."
 
 #: src/keylist.c:591 src/ownertrustdlg.c:122
 msgid "Owner Trust"
@@ -1458,23 +1443,26 @@
 "holder of the certificate to correctly sign (certify) other certificates.  "
 "It is only meaningful for OpenPGP."
 msgstr ""
+"لقد وُضِعت الثقة في المالك من قِبلك وتوضّح إلى أي مدى تثق في حامل الشهادة ليوقّع "
+"(يُجيز) الشهادات الأخرى.  لهذا معنى بالنسبة إلى OpenGPG فقط."
 
 #: src/keylist.c:604
-#, fuzzy
 msgid "Validity"
-msgstr "صلاحية المفتاح"
+msgstr "الصلاحية"
 
 #: src/keylist.c:605
 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
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
-msgstr ""
+msgstr "اسم المستخدم هو اسم وفي أحان كثيرة عنوان بريد الشهادة."
 
 #: src/keyring.c:457
 msgid "No keys selected for signing."
@@ -1692,7 +1680,7 @@
 
 #: src/keyring.c:1249
 msgid "The key has both a private and a public part"
-msgstr "للمفتاح جزئين سرّي وعلني"
+msgstr "للمفتاح جزءان؛ سرّي وعلني"
 
 #: src/keyring.c:1252
 msgid "The key has only a public part"
@@ -1848,7 +1836,7 @@
 msgid "Sign only _locally"
 msgstr "وقّع _محليّا فقط"
 
-#: src/options.c:316
+#: src/options.c:312
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -2007,19 +1995,16 @@
 msgstr "خادوم المفاتيح الذي حددته غير صالح"
 
 #: src/settingsdlg.c:59
-#, fuzzy
 msgid "<b>Default _key</b>"
-msgstr "ال_مفتاح البدئي:"
+msgstr "<b>ال_مفتاح البدئي</b>"
 
 #: src/settingsdlg.c:111
-#, fuzzy
 msgid "<b>Default key_server</b>"
-msgstr "_خادوم المفاتيح البدئي:"
+msgstr "<b>_خادوم المفاتيح البدئي</b>"
 
 #: src/settingsdlg.c:158
-#, fuzzy
 msgid "<b>Use _advanced mode</b>"
-msgstr "استخدم الطَّور ال_متقدّم:"
+msgstr "<b>استخدم الطَّور ال_متقدّم:</b>"
 
 #: src/settingsdlg.c:193
 msgid "Settings"
@@ -2058,28 +2043,3 @@
 #: src/verifydlg.c:370
 msgid "Signatures:"
 msgstr "التوقيعات:"
-
-#~ msgid "GPA Warning"
-#~ msgstr "تحذير GPA"
-
-#~ msgid ""
-#~ "One of your secret keys contains an ElGamal signing key. Due to a bug in "
-#~ "GnuPG, all ElGamal keys used with GnuPG 1.0.2 and later must be "
-#~ "considered compromised.\n"
-#~ "\n"
-#~ "Please revoke your key as soon as possible.\n"
-#~ "\n"
-#~ "The affected key is:"
-#~ msgstr ""
-#~ "يحوي أحد مفاتيحك السرية مفتاح توقيع \"الجمل\". بسبب علّة في GnuPG، كل "
-#~ "مفاتيح الجمل المستخدمة مع GnuPG 1.0.2 أو أحدث يجب اعتبارها مهددة.\n"
-#~ "\n"
-#~ "من فضلك انقض مفتاحك بأسرع ما يمكن.\n"
-#~ "\n"
-#~ "المفتاح المتأثر:"
-
-#~ msgid "Sign files"
-#~ msgstr "وقّع الملفات"
-
-#~ msgid "sign in separate _file"
-#~ msgstr "وقع في _ملف خاص"

Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po	2008-03-19 03:36:16 UTC (rev 858)
+++ trunk/po/es.po	2008-03-20 21:40:36 UTC (rev 859)
@@ -9,8 +9,8 @@
 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"
-"PO-Revision-Date: 2008-03-12 12:32+0100\n"
+"POT-Creation-Date: 2008-03-20 22:28+0100\n"
+"PO-Revision-Date: 2008-03-11 09:35+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <es at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,302 +18,302 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/clipboard.c:367 src/fileman.c:350
+#: src/clipboard.c:381 src/fileman.c:393
 msgid "Open File"
 msgstr "Abrir Archivo"
 
-#: src/clipboard.c:395 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:409 src/confdialog.c:1266 src/gtktools.c:353
 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:412
+#: src/clipboard.c:426
 #, 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:481
+#: src/clipboard.c:547
 msgid "Save As..."
 msgstr "Guardar Como..."
 
-#: 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/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
 msgid "Clipboard"
 msgstr "Portapapeles"
 
-#: src/clipboard.c:692 src/fileman.c:472 src/keyring.c:863
+#: src/clipboard.c:758 src/fileman.c:513 src/keyring.c:863
 msgid "/_File"
 msgstr "/_Archivo"
 
-#: src/clipboard.c:693 src/fileman.c:474
+#: src/clipboard.c:759 src/fileman.c:515
 msgid "/File/C_lear"
 msgstr "/Archivo/Li_mpiar"
 
-#: src/clipboard.c:694 src/fileman.c:473
+#: src/clipboard.c:760 src/fileman.c:514
 msgid "/File/_Open"
 msgstr "/Archivo/_Abrir"
 
-#: src/clipboard.c:695
+#: src/clipboard.c:761
 msgid "/File/Save _As"
 msgstr "/Archivo/Guardar _Como"
 
-#: src/clipboard.c:697 src/fileman.c:475
+#: src/clipboard.c:763 src/fileman.c:516
 msgid "/File/sep1"
 msgstr "/Archivo/sep1"
 
-#: src/clipboard.c:698 src/fileman.c:476
+#: src/clipboard.c:764 src/fileman.c:517
 msgid "/File/_Sign"
 msgstr "/Archivo/_Firmar"
 
-#: src/clipboard.c:699 src/fileman.c:477
+#: src/clipboard.c:765 src/fileman.c:518
 msgid "/File/_Verify"
 msgstr "/Archivo/_Verificar"
 
-#: src/clipboard.c:700 src/fileman.c:478
+#: src/clipboard.c:766 src/fileman.c:519
 msgid "/File/_Encrypt"
 msgstr "/Archivo/_Cifrar"
 
-#: src/clipboard.c:701 src/fileman.c:479
+#: src/clipboard.c:767 src/fileman.c:520
 msgid "/File/_Decrypt"
 msgstr "/Archivo/_Descifrar"
 
-#: src/clipboard.c:702 src/fileman.c:480
+#: src/clipboard.c:768 src/fileman.c:521
 msgid "/File/sep2"
 msgstr "/Archivo/sep2"
 
-#: src/clipboard.c:703 src/fileman.c:481 src/keyring.c:864
+#: src/clipboard.c:769 src/fileman.c:522 src/keyring.c:864
 msgid "/File/_Close"
 msgstr "/Archivo/C_errar"
 
-#: src/clipboard.c:704 src/fileman.c:482 src/keyring.c:866
+#: src/clipboard.c:770 src/fileman.c:523 src/keyring.c:866
 msgid "/File/_Quit"
 msgstr "/Archivo/_Salir"
 
-#: src/clipboard.c:707 src/fileman.c:485 src/keyring.c:869
+#: src/clipboard.c:773 src/fileman.c:526 src/keyring.c:869
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/clipboard.c:710
+#: src/clipboard.c:776
 msgid "/Edit/_Undo"
 msgstr "/Editar/_Copiar"
 
-#: src/clipboard.c:711
+#: src/clipboard.c:777
 msgid "/Edit/_Redo"
 msgstr "/Editar/_Rehacer"
 
-#: src/clipboard.c:712
+#: src/clipboard.c:778
 msgid "/Edit/sep0"
 msgstr "/Editar/sep0"
 
-#: src/clipboard.c:714 src/clipboard.c:750
+#: src/clipboard.c:780 src/clipboard.c:816
 msgid "/Edit/Cut"
 msgstr "/Editar/Co_rtar"
 
-#: src/clipboard.c:715 src/keyring.c:870
+#: src/clipboard.c:781 src/keyring.c:870
 msgid "/Edit/_Copy"
 msgstr "/Editar/_Copiar"
 
-#: src/clipboard.c:716 src/keyring.c:872
+#: src/clipboard.c:782 src/keyring.c:872
 msgid "/Edit/_Paste"
 msgstr "/Editar/_Pegar"
 
-#: src/clipboard.c:717
+#: src/clipboard.c:783
 msgid "/Edit/_Delete"
 msgstr "/Editar/_Eliminar"
 
-#: src/clipboard.c:718 src/keyring.c:874
+#: src/clipboard.c:784 src/keyring.c:874
 msgid "/Edit/sep1"
 msgstr "/Editar/sep1"
 
-#: src/clipboard.c:719 src/fileman.c:486 src/keyring.c:875
+#: src/clipboard.c:785 src/fileman.c:527 src/keyring.c:875
 msgid "/Edit/Select _All"
 msgstr "/Editar/Seleccionar _Todo"
 
-#: src/clipboard.c:721 src/fileman.c:487 src/keyring.c:876
+#: src/clipboard.c:787 src/fileman.c:528 src/keyring.c:876
 msgid "/Edit/sep2"
 msgstr "/Editar/sep2"
 
-#: src/clipboard.c:722 src/fileman.c:488 src/keyring.c:877
+#: src/clipboard.c:788 src/fileman.c:529 src/keyring.c:877
 msgid "/Edit/Pr_eferences..."
 msgstr "/Editar/Pr_eferencias..."
 
-#: src/clipboard.c:724 src/fileman.c:490 src/keyring.c:879
+#: 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:728 src/fileman.c:494 src/keyring.c:906
+#: src/clipboard.c:794 src/fileman.c:535 src/keyring.c:906
 msgid "/_Windows"
 msgstr "/_Ventanas"
 
-#: src/clipboard.c:729 src/fileman.c:495 src/keyring.c:907
+#: 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:730 src/fileman.c:496
+#: src/clipboard.c:796 src/fileman.c:537
 msgid "/Windows/_Filemanager"
 msgstr "/Ventanas/Gestor de _Archivos"
 
-#: src/clipboard.c:731 src/fileman.c:497 src/keyring.c:909
+#: src/clipboard.c:797 src/fileman.c:538 src/keyring.c:909
 msgid "/Windows/_Clipboard"
 msgstr "/Ventanas/_Portapapeles"
 
-#: src/clipboard.c:758 src/keyring.c:948
+#: src/clipboard.c:824 src/keyring.c:948
 msgid "/Edit/Copy"
 msgstr "/Editar/Copiar"
 
-#: src/clipboard.c:766
+#: src/clipboard.c:832
 msgid "/Edit/Delete"
 msgstr "/Editar/Eliminar"
 
-#: src/clipboard.c:774
+#: src/clipboard.c:840
 msgid "/Edit/Paste"
 msgstr "/Editar/Pegar"
 
-#: src/clipboard.c:879
+#: src/clipboard.c:945
 msgid "Clear buffer"
 msgstr "Limpiar buffer"
 
-#: src/clipboard.c:879
+#: src/clipboard.c:945
 msgid "clear buffer"
 msgstr "limpiar buffer"
 
-#: src/clipboard.c:887 src/fileman.c:602
+#: src/clipboard.c:953 src/fileman.c:643
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: src/clipboard.c:887 src/fileman.c:602
+#: src/clipboard.c:953 src/fileman.c:643
 msgid "open file"
 msgstr "abrir archivo"
 
-#: src/clipboard.c:892
+#: src/clipboard.c:958
 msgid "Save to a file"
 msgstr "Guardar a un archivo"
 
-#: src/clipboard.c:892
+#: src/clipboard.c:958
 msgid "save file as"
 msgstr "guardar archivo como"
 
-#: src/clipboard.c:900
+#: src/clipboard.c:966
 msgid "Cut the selection"
 msgstr "Cortar la selección"
 
-#: src/clipboard.c:901
+#: src/clipboard.c:967
 msgid "cut the selection"
 msgstr "cortar la selección"
 
-#: src/clipboard.c:907
+#: src/clipboard.c:973
 msgid "Copy the selection"
 msgstr "Copiar la selección"
 
-#: src/clipboard.c:908
+#: src/clipboard.c:974
 msgid "copy the selection"
 msgstr "copiar la selección"
 
-#: src/clipboard.c:914
+#: src/clipboard.c:980
 msgid "Paste the clipboard"
 msgstr "Pegar el portapapeles"
 
-#: src/clipboard.c:915
+#: src/clipboard.c:981
 msgid "paste the clipboard"
 msgstr "pegar el portapapeles"
 
-#: src/clipboard.c:925 src/fileman.c:612 src/keyring.c:1570
+#: src/clipboard.c:991 src/fileman.c:653 src/keyring.c:1570
 msgid "Sign"
 msgstr "Firmar"
 
-#: src/clipboard.c:926
+#: src/clipboard.c:992
 msgid "Sign the selected text"
 msgstr "Firmar el texto seleccionado"
 
-#: src/clipboard.c:927
+#: src/clipboard.c:993
 msgid "sign text"
 msgstr "firmar texto"
 
-#: src/clipboard.c:935 src/fileman.c:623
+#: src/clipboard.c:1001 src/fileman.c:664
 msgid "Verify"
 msgstr "Verificar"
 
-#: src/clipboard.c:936
+#: src/clipboard.c:1002
 msgid "Check signatures of selected text"
 msgstr "Comprobar las firmas en el texto seleccionado"
 
-#: src/clipboard.c:937
+#: src/clipboard.c:1003
 msgid "verify text"
 msgstr "verificar texto"
 
-#: src/clipboard.c:945 src/fileman.c:634
+#: src/clipboard.c:1011 src/fileman.c:675
 msgid "Encrypt"
 msgstr "Cifrar"
 
-#: src/clipboard.c:946
+#: src/clipboard.c:1012
 msgid "Encrypt the selected text"
 msgstr "Cifrar el texto seleccionado"
 
-#: src/clipboard.c:947
+#: src/clipboard.c:1013
 msgid "encrypt text"
 msgstr "cifrar texto"
 
-#: src/clipboard.c:955 src/fileman.c:645
+#: src/clipboard.c:1021 src/fileman.c:686
 msgid "Decrypt"
 msgstr "Descifrar"
 
-#: src/clipboard.c:956
+#: src/clipboard.c:1022
 msgid "Decrypt the selected text"
 msgstr "Descifrar el texto seleccionado"
 
-#: src/clipboard.c:957
+#: src/clipboard.c:1023
 msgid "decrypt text"
 msgstr "descifrar texto"
 
-#: src/clipboard.c:967 src/fileman.c:658 src/keyring.c:1631
+#: 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:968 src/fileman.c:659 src/keyring.c:1632
+#: src/clipboard.c:1034 src/fileman.c:700 src/keyring.c:1632
 msgid "preferences"
 msgstr "preferencias"
 
-#: src/clipboard.c:975 src/fileman.c:666
+#: src/clipboard.c:1041 src/fileman.c:707
 msgid "Keyring"
 msgstr "Anillo de claves"
 
-#: src/clipboard.c:976 src/fileman.c:667
+#: src/clipboard.c:1042 src/fileman.c:708
 msgid "Open the keyring editor"
 msgstr "Abrir el editor de anillo de claves"
 
-#: src/clipboard.c:977 src/fileman.c:668
+#: src/clipboard.c:1043 src/fileman.c:709
 msgid "keyring editor"
 msgstr "editor del anillo de claves"
 
-#: src/clipboard.c:983 src/keyring.c:1648
+#: src/clipboard.c:1049 src/keyring.c:1648
 msgid "Files"
 msgstr "Archivos"
 
-#: src/clipboard.c:984 src/keyring.c:1649
+#: src/clipboard.c:1050 src/keyring.c:1649
 msgid "Open the file manager"
 msgstr "Abrir el gestor de archivos"
 
-#: src/clipboard.c:985 src/keyring.c:1650
+#: src/clipboard.c:1051 src/keyring.c:1650
 msgid "file manager"
 msgstr "gestor de archivos"
 
-#: src/clipboard.c:992 src/fileman.c:684 src/keyring.c:1665
+#: src/clipboard.c:1058 src/fileman.c:725 src/keyring.c:1665
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/clipboard.c:993 src/fileman.c:685 src/keyring.c:1666
+#: 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:994 src/fileman.c:686 src/keyring.c:1667
+#: src/clipboard.c:1060 src/fileman.c:727 src/keyring.c:1667
 msgid "help"
 msgstr "ayuda"
 
-#: src/clipboard.c:1084
+#: src/clipboard.c:1150
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Privacy Assistant - Portapapeles"
 
@@ -382,9 +382,9 @@
 msgstr "Experto"
 
 #: 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
+#: 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"
 
@@ -424,86 +424,86 @@
 msgid "_expire on:"
 msgstr "_caduca el:"
 
-#: src/fileman.c:355 src/fileman.c:953
-msgid "The file is already open."
-msgstr "El archivo ya está abierto."
-
-#: src/fileman.c:516
+#: src/fileman.c:557
 msgid "/File/Sign"
 msgstr "/Archivo/Firmar"
 
-#: src/fileman.c:521
+#: src/fileman.c:562
 msgid "/File/Verify"
 msgstr "/Archivo/Verificar"
 
-#: src/fileman.c:526
+#: src/fileman.c:567
 msgid "/File/Encrypt"
 msgstr "/Archivo/Cifrar"
 
-#: src/fileman.c:531
+#: src/fileman.c:572
 msgid "/File/Decrypt"
 msgstr "/Archivo/Descifrar"
 
-#: src/fileman.c:606
+#: src/fileman.c:647
 msgid "Close all files"
 msgstr "Cerrar todos los archivos"
 
-#: src/fileman.c:606
+#: src/fileman.c:647
 msgid "close files"
 msgstr "cerrar archivos"
 
-#: src/fileman.c:613
+#: src/fileman.c:654
 msgid "Sign the selected file"
 msgstr "Firmar archivo seleccionado"
 
-#: src/fileman.c:614
+#: src/fileman.c:655
 msgid "sign file"
 msgstr "firmar archivo"
 
-#: src/fileman.c:624
+#: src/fileman.c:665
 msgid "Check signatures of selected file"
 msgstr "Comprobar las firmas en el archivo seleccionado"
 
-#: src/fileman.c:625
+#: src/fileman.c:666
 msgid "verify file"
 msgstr "verificar archivo"
 
-#: src/fileman.c:635
+#: src/fileman.c:676
 msgid "Encrypt the selected file"
 msgstr "Cifrar el archivo seleccionado"
 
-#: src/fileman.c:636
+#: src/fileman.c:677
 msgid "encrypt file"
 msgstr "cifrar archivo"
 
-#: src/fileman.c:646
+#: src/fileman.c:687
 msgid "Decrypt the selected file"
 msgstr "Descifrar el archivo seleccionado"
 
-#: src/fileman.c:647
+#: src/fileman.c:688
 msgid "decrypt file"
 msgstr "descifrar archivo"
 
-#: src/fileman.c:676 src/keyring.c:1658
+#: src/fileman.c:717 src/keyring.c:1658
 msgid "Open the clipboard"
 msgstr "Abrir el portapapeles"
 
-#: src/fileman.c:677 src/keyring.c:1659
+#: src/fileman.c:718 src/keyring.c:1659
 msgid "clipboard"
 msgstr "portapapeles"
 
-#: src/fileman.c:785
+#: src/fileman.c:826
 msgid "File"
 msgstr "Archivo"
 
-#: src/fileman.c:850
+#: src/fileman.c:891
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Gestor de Archivos"
 
-#: src/fileman.c:876
+#: src/fileman.c:917
 msgid "File Manager"
 msgstr "Gestor de Archivos"
 
+#: src/fileman.c:993
+msgid "The file is already open."
+msgstr "El archivo ya está abierto."
+
 #: src/filesigndlg.c:134
 msgid "Sign documents"
 msgstr "Firmar documentos"
@@ -524,32 +524,9 @@
 msgid "_detached signature"
 msgstr "firma por _separado"
 
-#: 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 ""
-"El archivo %s ya existe.\n"
-"¿Quiere sobreescribirlo?"
-
-#: 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 "_Sí"
-
-#: 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 "_No"
-
-#: src/gpabackupop.c:229
-#, c-format
-msgid ""
 "A copy of your secret key has been made to the file:\n"
 "\n"
 "\t\"%s\"\n"
@@ -564,31 +541,19 @@
 "Esta es información confidencial, y debería ser almacenada con cuidado\n"
 "(por ejemplo, en un diskette guardado en lugar seguro)."
 
-#: src/gpabackupop.c:244
+#: src/gpabackupop.c:223
 msgid "An error ocurred during the backup operation."
 msgstr "Un error ocurrió durante la operación de respaldo."
 
-#: src/gpabackupop.c:260
+#: src/gpabackupop.c:245
 msgid "Backup key to file"
 msgstr "Archivo de copia de seguridad:"
 
-#: src/gpabackupop.c:287
-msgid "Backup Keys"
-msgstr "Hacer Copia de Seguridad"
-
-#: src/gpabackupop.c:311
+#: src/gpabackupop.c:255
 #, c-format
 msgid "Generating backup of key: %s"
 msgstr "Haciendo copia de seguridad de la clave: %s"
 
-#: src/gpabackupop.c:317
-msgid "_Backup to file:"
-msgstr "_Archivo de copia de seguridad:"
-
-#: src/gpabackupop.c:329
-msgid "B_rowse..."
-msgstr "_Examinar..."
-
 #: src/gpa.c:92
 msgid "Output version information and exit"
 msgstr "Mostrar información de versión y terminar"
@@ -629,15 +594,15 @@
 msgid "The keys have been copied to the clipboard."
 msgstr "Las claves se han copiado al portapapeles."
 
-#: src/gpaexportfileop.c:133
+#: src/gpaexportfileop.c:139
 msgid "Export public keys to file"
 msgstr "Exportar clave publica a un archivo"
 
-#: src/gpaexportfileop.c:137
+#: src/gpaexportfileop.c:150
 msgid "_armor"
 msgstr "_armadura"
 
-#: src/gpaexportfileop.c:171
+#: src/gpaexportfileop.c:182
 #, c-format
 msgid "The keys have been exported to %s."
 msgstr "Las claves se han exportado a %s."
@@ -653,6 +618,18 @@
 "claves público (\"%s\").\n"
 "¿Está seguro de que quiere distribuir esta clave?"
 
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:455
+#: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
+#: src/keydeletedlg.c:93 src/keysigndlg.c:62 src/settingsdlg.c:165
+msgid "_Yes"
+msgstr "_Sí"
+
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:456
+#: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
+#: src/keydeletedlg.c:95 src/keysigndlg.c:64 src/settingsdlg.c:168
+msgid "_No"
+msgstr "_No"
+
 #: src/gpaexportserverop.c:187
 msgid "The keys have been sent to the server."
 msgstr "Las claves se han enviado al servidor."
@@ -681,8 +658,8 @@
 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:727
-#: src/gpafilesignop.c:510 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
+#: 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
 msgid "Wrong passphrase!"
 msgstr "¡Contraseña incorrecta!"
@@ -713,7 +690,7 @@
 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:422
+#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:436
 #: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
 msgid "_Close"
 msgstr "_Cerrar"
@@ -731,7 +708,14 @@
 msgid "The following key expired on %s:"
 msgstr "Esta clave caducó el %s:"
 
-#: src/gpafileencryptop.c:641 src/gpafilesignop.c:414
+#: src/gpafileencryptop.c:596 src/gpafilesignop.c:429
+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
 msgid "You didn't select any key for signing"
 msgstr "No se seleccionó ninguna clave con la que firmar"
 
@@ -739,13 +723,6 @@
 msgid "Signing..."
 msgstr "Firmando..."
 
-#: 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 "Verificando..."
@@ -766,7 +743,7 @@
 msgid "Generating Key..."
 msgstr "Generando Clave..."
 
-#: src/gpaimportfileop.c:131
+#: src/gpaimportfileop.c:132
 msgid "Import public keys from file"
 msgstr "Importar claves públicas de fichero"
 
@@ -894,16 +871,16 @@
 msgid "Can authenticate"
 msgstr "Puede autenticar"
 
-#: 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:830
+#: src/gpgmetools.c:949
 msgid "Revoked"
 msgstr "Revocada"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:615 src/gpgmetools.c:936
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:945
 msgid "Expired"
 msgstr "Caducada"
 
-#: src/gpasubkeylist.c:145 src/gpgmetools.c:617
+#: src/gpasubkeylist.c:145 src/gpgmetools.c:626
 msgid "Disabled"
 msgstr "Desactivada"
 
@@ -911,11 +888,11 @@
 msgid "Unsigned"
 msgstr "Sin firmar"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:927 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:936 src/verifydlg.c:212
 msgid "Valid"
 msgstr "Válida"
 
-#: src/gpawidgets.c:72 src/gpgmetools.c:661 src/gpgmetools.c:668
+#: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
 #: src/keyring.c:1176 src/keysigndlg.c:104
 msgid "User Name:"
 msgstr "Nombre de Usuario:"
@@ -924,28 +901,28 @@
 msgid "User Names:"
 msgstr "Nombres de Usuario:"
 
-#: src/gpawidgets.c:78 src/gpgmetools.c:662 src/gpgmetools.c:669
+#: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
 #: src/keyring.c:1178
 msgid "Key ID:"
 msgstr "ID de Clave:"
 
-#: src/gpawidgets.c:194
+#: src/gpawidgets.c:180
 msgid "Expiration"
 msgstr "Caducidad"
 
-#: src/gpawidgets.c:201
+#: src/gpawidgets.c:187
 msgid "_indefinitely valid"
 msgstr "válida _indefinidamente"
 
-#: src/gpawidgets.c:210
+#: src/gpawidgets.c:196
 msgid "expire _after"
 msgstr "caduca _pasado"
 
-#: src/gpawidgets.c:229
+#: src/gpawidgets.c:216
 msgid "expire o_n:"
 msgstr "_caduca el:"
 
-#: src/gpawidgets.c:302 src/keygendlg.c:295
+#: src/gpawidgets.c:292 src/keygendlg.c:295
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -1001,8 +978,17 @@
 "Esto probablemente se deba a un fallo en GPA.\n"
 "GPA intentará recuperarse de este error."
 
-#: src/gpgmetools.c:477
+#: src/gpgmetools.c:139
+#, c-format
 msgid ""
+"The file %s already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"El archivo %s ya existe.\n"
+"¿Quiere sobreescribirlo?"
+
+#: 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"
@@ -1015,7 +1001,7 @@
 "************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:482
+#: src/gpgmetools.c:491
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -1023,106 +1009,106 @@
 "La clave contenida en este archivo es:\n"
 "\n"
 
-#: src/gpgmetools.c:543
+#: src/gpgmetools.c:552
 msgid "DSA and ElGamal (default)"
 msgstr "DSA y ElGamal (por defecto)"
 
-#: src/gpgmetools.c:544
+#: src/gpgmetools.c:553
 msgid "DSA (sign only)"
 msgstr "DSA (solo firma)"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:554
 msgid "RSA (sign only)"
 msgstr "RSA (solo firma)"
 
-#: 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:941 src/gpgmetools.c:974
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: src/gpgmetools.c:584
+#: src/gpgmetools.c:593
 msgid "Never"
 msgstr "Nunca"
 
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:596
 msgid "Marginal"
 msgstr "Parcial"
 
-#: src/gpgmetools.c:590
+#: src/gpgmetools.c:599
 msgid "Full"
 msgstr "Total"
 
-#: src/gpgmetools.c:593
+#: src/gpgmetools.c:602
 msgid "Ultimate"
 msgstr "Absoluta"
 
-#: src/gpgmetools.c:619
+#: src/gpgmetools.c:628
 msgid "Incomplete"
 msgstr "Incompleta"
 
-#: src/gpgmetools.c:625
+#: src/gpgmetools.c:634
 msgid "Fully Valid"
 msgstr "Totalmente Válida"
 
-#: src/gpgmetools.c:659
+#: src/gpgmetools.c:668
 msgid "Please enter the passphrase for the following key:"
 msgstr "Por favor introduzca la contraseña para la siguiente clave:"
 
-#: src/gpgmetools.c:667
+#: src/gpgmetools.c:676
 msgid "Wrong passphrase, please try again:"
 msgstr "Contraseña incorrecta, por favor vuelva a intentarlo:"
 
-#: src/gpgmetools.c:692
+#: src/gpgmetools.c:701
 msgid "Enter Passphrase"
 msgstr "Introduzca Contraseña"
 
-#: src/gpgmetools.c:814
+#: src/gpgmetools.c:823
 msgid "[None]"
 msgstr "[Ninguno]"
 
-#: src/gpgmetools.c:904 src/verifydlg.c:269
+#: src/gpgmetools.c:913 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[Identificador de usuario, user ID, desconocido]"
 
-#: src/gpgmetools.c:930 src/verifydlg.c:217
+#: src/gpgmetools.c:939 src/verifydlg.c:217
 msgid "Bad"
 msgstr "Incorrecta"
 
-#: src/gpgmetools.c:953
+#: src/gpgmetools.c:962
 msgid "Generic"
 msgstr "Genérica"
 
-#: src/gpgmetools.c:956
+#: src/gpgmetools.c:965
 msgid "Persona"
 msgstr "Persona"
 
-#: src/gpgmetools.c:959
+#: src/gpgmetools.c:968
 msgid "Casual"
 msgstr "Casual"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:971
 msgid "Positive"
 msgstr "Positiva"
 
-#: src/gpgmetools.c:980
+#: src/gpgmetools.c:989
 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:983
+#: src/gpgmetools.c:992
 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:989
+#: src/gpgmetools.c:998
 msgid "The key can be used for certification and encryption."
 msgstr "Esta clave puede utilizarse para certificación y cifrado."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:1001
 msgid "The key can be used only for certification."
 msgstr "Esta clave puede utilizarse sólo para certificación."
 
-#: src/gpgmetools.c:1000
+#: src/gpgmetools.c:1009
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -1130,15 +1116,15 @@
 "Esta clave puede utilizarse sólo para firma y cifrado, pero no para\n"
 "certificación."
 
-#: src/gpgmetools.c:1003
+#: src/gpgmetools.c:1012
 msgid "The key can be used only for signing."
 msgstr "Esta clave puede utilizarse tan sólo para firma."
 
-#: src/gpgmetools.c:1008
+#: src/gpgmetools.c:1017
 msgid "The key can be used only for encryption."
 msgstr "Esta clave puede utilizarse tan sólo para cifrado."
 
-#: src/gpgmetools.c:1011
+#: src/gpgmetools.c:1020
 msgid "This key is useless."
 msgstr "Esta clave no vale para nada."
 
@@ -1146,59 +1132,59 @@
 msgid "GPA Error"
 msgstr "Error de GPA"
 
-#: src/helpmenu.c:202
+#: src/helpmenu.c:216
 msgid "About GPA"
 msgstr "Acerca de GPA"
 
-#: src/helpmenu.c:247
+#: src/helpmenu.c:261
 msgid "Brought to you by:"
 msgstr "De la mano de:"
 
-#: src/helpmenu.c:284
+#: src/helpmenu.c:298
 msgid "GPA is Free Software under the"
 msgstr "GPA es Software Libre bajo la"
 
-#: src/helpmenu.c:288
+#: src/helpmenu.c:302
 msgid "GNU General Public License."
 msgstr "GNU General Public License,"
 
-#: src/helpmenu.c:292
+#: src/helpmenu.c:306
 msgid "For news see:"
 msgstr "Noticias en:"
 
-#: src/helpmenu.c:297
+#: src/helpmenu.c:311
 msgid "http://www.gpg4win.org"
 msgstr "http://www.gpg4win.org"
 
-#: src/helpmenu.c:299
+#: src/helpmenu.c:313
 msgid "http://www.gnupg.org"
 msgstr "http://www.gnupg.org"
 
-#: src/helpmenu.c:382
+#: src/helpmenu.c:396
 msgid "GNU General Public License"
 msgstr "GNU General Public License"
 
-#: src/helpmenu.c:409
+#: src/helpmenu.c:423
 msgid "_GNU General Public License"
 msgstr "_GNU General Public License"
 
-#: src/helpmenu.c:436
+#: src/helpmenu.c:450
 msgid "Show Help Text\n"
 msgstr "Mostrar texto de ayuda\n"
 
-#: src/helpmenu.c:444
+#: src/helpmenu.c:458
 msgid "/_Help"
 msgstr "/A_yuda"
 
-#: src/helpmenu.c:446
+#: src/helpmenu.c:460
 msgid "/Help/_Contents"
 msgstr "/Ayuda/_Contenidos"
 
-#: src/helpmenu.c:449
+#: src/helpmenu.c:463
 msgid "/Help/_License"
 msgstr "/Ayuda/_Licencia"
 
-#: src/helpmenu.c:450
+#: src/helpmenu.c:464
 msgid "/Help/_About"
 msgstr "/Ayuda/Acerca de..."
 
@@ -1873,7 +1859,7 @@
 msgid "Sign only _locally"
 msgstr "Firmar solo _localmente"
 
-#: src/options.c:316
+#: src/options.c:312
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -2042,19 +2028,16 @@
 msgstr "El servidor de claves que especificó no es válido"
 
 #: src/settingsdlg.c:59
-#, fuzzy
 msgid "<b>Default _key</b>"
-msgstr "Clave por _defecto:"
+msgstr "<b>Clave por _defecto</b>"
 
 #: src/settingsdlg.c:111
-#, fuzzy
 msgid "<b>Default key_server</b>"
-msgstr "Servidor de _claves por defecto:"
+msgstr "<b>Servidor de _claves por defecto</b>"
 
 #: src/settingsdlg.c:158
-#, fuzzy
 msgid "<b>Use _advanced mode</b>"
-msgstr "Usar modo _avanzado:"
+msgstr "<b>Usar modo _avanzado</b>"
 
 #: src/settingsdlg.c:193
 msgid "Settings"

Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2008-03-19 03:36:16 UTC (rev 858)
+++ trunk/po/fr.po	2008-03-20 21:40:36 UTC (rev 859)
@@ -6,9 +6,9 @@
 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"
-"PO-Revision-Date: 2008-03-12 12:34+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2008-03-20 22:28+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,300 +16,300 @@
 "X-Generator: KBabel 0.9.6\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/clipboard.c:367 src/fileman.c:350
+#: src/clipboard.c:381 src/fileman.c:393
 msgid "Open File"
 msgstr "Ouvrir fichier"
 
-#: src/clipboard.c:395 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:409 src/confdialog.c:1266 src/gtktools.c:353
 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:412
+#: src/clipboard.c:426
 #, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
-msgstr ""
+msgstr "Le fichier %s a une taille de %lli%s. Voulez-vous vraiment l'ouvrir ?"
 
-#: src/clipboard.c:481
+#: src/clipboard.c:547
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: 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/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
 msgid "Clipboard"
 msgstr "Presse-papiers"
 
-#: src/clipboard.c:692 src/fileman.c:472 src/keyring.c:863
+#: src/clipboard.c:758 src/fileman.c:513 src/keyring.c:863
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: src/clipboard.c:693 src/fileman.c:474
+#: src/clipboard.c:759 src/fileman.c:515
 msgid "/File/C_lear"
 msgstr "/Fichier/_Remise à zéro"
 
-#: src/clipboard.c:694 src/fileman.c:473
+#: src/clipboard.c:760 src/fileman.c:514
 msgid "/File/_Open"
 msgstr "/Fichier/_Ouvrir"
 
-#: src/clipboard.c:695
+#: src/clipboard.c:761
 msgid "/File/Save _As"
 msgstr "/Fichier/Enregistrer sous..."
 
-#: src/clipboard.c:697 src/fileman.c:475
+#: src/clipboard.c:763 src/fileman.c:516
 msgid "/File/sep1"
 msgstr "/Fichier/sep1"
 
-#: src/clipboard.c:698 src/fileman.c:476
+#: src/clipboard.c:764 src/fileman.c:517
 msgid "/File/_Sign"
 msgstr "/Fichier/_Signer"
 
-#: src/clipboard.c:699 src/fileman.c:477
+#: src/clipboard.c:765 src/fileman.c:518
 msgid "/File/_Verify"
 msgstr "/Fichier/_Vérifier"
 
-#: src/clipboard.c:700 src/fileman.c:478
+#: src/clipboard.c:766 src/fileman.c:519
 msgid "/File/_Encrypt"
 msgstr "/Fichier/_Chiffrer"
 
-#: src/clipboard.c:701 src/fileman.c:479
+#: src/clipboard.c:767 src/fileman.c:520
 msgid "/File/_Decrypt"
 msgstr "/Fichier/_Déchiffrer"
 
-#: src/clipboard.c:702 src/fileman.c:480
+#: src/clipboard.c:768 src/fileman.c:521
 msgid "/File/sep2"
 msgstr "/Fichier/sep2"
 
-#: src/clipboard.c:703 src/fileman.c:481 src/keyring.c:864
+#: src/clipboard.c:769 src/fileman.c:522 src/keyring.c:864
 msgid "/File/_Close"
 msgstr "/Fichier/_Fermer"
 
-#: src/clipboard.c:704 src/fileman.c:482 src/keyring.c:866
+#: src/clipboard.c:770 src/fileman.c:523 src/keyring.c:866
 msgid "/File/_Quit"
 msgstr "/Fichier/_Quitter"
 
-#: src/clipboard.c:707 src/fileman.c:485 src/keyring.c:869
+#: src/clipboard.c:773 src/fileman.c:526 src/keyring.c:869
 msgid "/_Edit"
 msgstr "/_Editer"
 
-#: src/clipboard.c:710
+#: src/clipboard.c:776
 msgid "/Edit/_Undo"
 msgstr "/Édition/Ann_uler"
 
-#: src/clipboard.c:711
+#: src/clipboard.c:777
 msgid "/Edit/_Redo"
 msgstr "/Édition/_Refaire"
 
-#: src/clipboard.c:712
+#: src/clipboard.c:778
 msgid "/Edit/sep0"
 msgstr "/Édition/sep02"
 
-#: src/clipboard.c:714 src/clipboard.c:750
+#: src/clipboard.c:780 src/clipboard.c:816
 msgid "/Edit/Cut"
 msgstr "/Édition/Couper"
 
-#: src/clipboard.c:715 src/keyring.c:870
+#: src/clipboard.c:781 src/keyring.c:870
 msgid "/Edit/_Copy"
 msgstr "/Édition/_Copier"
 
-#: src/clipboard.c:716 src/keyring.c:872
+#: src/clipboard.c:782 src/keyring.c:872
 msgid "/Edit/_Paste"
 msgstr "/Édition/_Coller"
 
-#: src/clipboard.c:717
+#: src/clipboard.c:783
 msgid "/Edit/_Delete"
 msgstr "/Édition/_Effacer"
 
-#: src/clipboard.c:718 src/keyring.c:874
+#: src/clipboard.c:784 src/keyring.c:874
 msgid "/Edit/sep1"
 msgstr "/Édition/sep1"
 
-#: src/clipboard.c:719 src/fileman.c:486 src/keyring.c:875
+#: src/clipboard.c:785 src/fileman.c:527 src/keyring.c:875
 msgid "/Edit/Select _All"
 msgstr "/Édition/Sélectionner _Tout"
 
-#: src/clipboard.c:721 src/fileman.c:487 src/keyring.c:876
+#: src/clipboard.c:787 src/fileman.c:528 src/keyring.c:876
 msgid "/Edit/sep2"
 msgstr "/Édition/sep2"
 
-#: src/clipboard.c:722 src/fileman.c:488 src/keyring.c:877
+#: 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:724 src/fileman.c:490 src/keyring.c:879
+#: 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:728 src/fileman.c:494 src/keyring.c:906
+#: src/clipboard.c:794 src/fileman.c:535 src/keyring.c:906
 msgid "/_Windows"
 msgstr "/_Fenêtres"
 
-#: src/clipboard.c:729 src/fileman.c:495 src/keyring.c:907
+#: 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:730 src/fileman.c:496
+#: src/clipboard.c:796 src/fileman.c:537
 msgid "/Windows/_Filemanager"
 msgstr "/Fenêtres/Gestionnaire de _fichiers"
 
-#: src/clipboard.c:731 src/fileman.c:497 src/keyring.c:909
+#: src/clipboard.c:797 src/fileman.c:538 src/keyring.c:909
 msgid "/Windows/_Clipboard"
 msgstr "/Fenêtres/_Presse-papiers"
 
-#: src/clipboard.c:758 src/keyring.c:948
+#: src/clipboard.c:824 src/keyring.c:948
 msgid "/Edit/Copy"
 msgstr "/Edition/Copier"
 
-#: src/clipboard.c:766
+#: src/clipboard.c:832
 msgid "/Edit/Delete"
 msgstr "/Edition/Effacer"
 
-#: src/clipboard.c:774
+#: src/clipboard.c:840
 msgid "/Edit/Paste"
 msgstr "/Edition/_Coller"
 
-#: src/clipboard.c:879
+#: src/clipboard.c:945
 msgid "Clear buffer"
 msgstr "Effacer tampon"
 
-#: src/clipboard.c:879
+#: src/clipboard.c:945
 msgid "clear buffer"
 msgstr "effacer tampon"
 
-#: src/clipboard.c:887 src/fileman.c:602
+#: src/clipboard.c:953 src/fileman.c:643
 msgid "Open a file"
 msgstr "Ouvrir un fichier"
 
-#: src/clipboard.c:887 src/fileman.c:602
+#: src/clipboard.c:953 src/fileman.c:643
 msgid "open file"
 msgstr "ouvrir fichier"
 
-#: src/clipboard.c:892
+#: src/clipboard.c:958
 msgid "Save to a file"
 msgstr "Enregistrer dans un fichier"
 
-#: src/clipboard.c:892
+#: src/clipboard.c:958
 msgid "save file as"
 msgstr "enregistrer le fichier _comme"
 
-#: src/clipboard.c:900
+#: src/clipboard.c:966
 msgid "Cut the selection"
 msgstr "Couper la sélection"
 
-#: src/clipboard.c:901
+#: src/clipboard.c:967
 msgid "cut the selection"
 msgstr "couper la sélection"
 
-#: src/clipboard.c:907
+#: src/clipboard.c:973
 msgid "Copy the selection"
 msgstr "couper la sélection"
 
-#: src/clipboard.c:908
+#: src/clipboard.c:974
 msgid "copy the selection"
 msgstr "copier la sélection"
 
-#: src/clipboard.c:914
+#: src/clipboard.c:980
 msgid "Paste the clipboard"
 msgstr "Coller le presse-papiers"
 
-#: src/clipboard.c:915
+#: src/clipboard.c:981
 msgid "paste the clipboard"
 msgstr "coller le presse-papiers"
 
-#: src/clipboard.c:925 src/fileman.c:612 src/keyring.c:1570
+#: src/clipboard.c:991 src/fileman.c:653 src/keyring.c:1570
 msgid "Sign"
 msgstr "Signer"
 
-#: src/clipboard.c:926
+#: src/clipboard.c:992
 msgid "Sign the selected text"
 msgstr "Signer le texte sélectionné"
 
-#: src/clipboard.c:927
+#: src/clipboard.c:993
 msgid "sign text"
 msgstr "signer le texte"
 
-#: src/clipboard.c:935 src/fileman.c:623
+#: src/clipboard.c:1001 src/fileman.c:664
 msgid "Verify"
 msgstr "Vérifier"
 
-#: src/clipboard.c:936
+#: src/clipboard.c:1002
 msgid "Check signatures of selected text"
 msgstr "Vérifier les signatures du texte sélectionné"
 
-#: src/clipboard.c:937
+#: src/clipboard.c:1003
 msgid "verify text"
 msgstr "vérifier texte"
 
-#: src/clipboard.c:945 src/fileman.c:634
+#: src/clipboard.c:1011 src/fileman.c:675
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: src/clipboard.c:946
+#: src/clipboard.c:1012
 msgid "Encrypt the selected text"
 msgstr "Chiffrer le fichier sélectionné"
 
-#: src/clipboard.c:947
+#: src/clipboard.c:1013
 msgid "encrypt text"
 msgstr "chiffrer texte"
 
-#: src/clipboard.c:955 src/fileman.c:645
+#: src/clipboard.c:1021 src/fileman.c:686
 msgid "Decrypt"
 msgstr "_Déchiffrer"
 
-#: src/clipboard.c:956
+#: src/clipboard.c:1022
 msgid "Decrypt the selected text"
 msgstr "Déchiffrer le texte sélectionné"
 
-#: src/clipboard.c:957
+#: src/clipboard.c:1023
 msgid "decrypt text"
 msgstr "déchiffrer texte"
 
-#: src/clipboard.c:967 src/fileman.c:658 src/keyring.c:1631
+#: 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:968 src/fileman.c:659 src/keyring.c:1632
+#: src/clipboard.c:1034 src/fileman.c:700 src/keyring.c:1632
 msgid "preferences"
 msgstr "préférences"
 
-#: src/clipboard.c:975 src/fileman.c:666
+#: src/clipboard.c:1041 src/fileman.c:707
 msgid "Keyring"
 msgstr "Trousseau de clefs"
 
-#: src/clipboard.c:976 src/fileman.c:667
+#: src/clipboard.c:1042 src/fileman.c:708
 msgid "Open the keyring editor"
 msgstr "Ouvrir l'éditeur de trousseau de clefs"
 
-#: src/clipboard.c:977 src/fileman.c:668
+#: src/clipboard.c:1043 src/fileman.c:709
 msgid "keyring editor"
 msgstr "éditeur de trousseau de clefs"
 
-#: src/clipboard.c:983 src/keyring.c:1648
+#: src/clipboard.c:1049 src/keyring.c:1648
 msgid "Files"
 msgstr "Fichiers"
 
-#: src/clipboard.c:984 src/keyring.c:1649
+#: src/clipboard.c:1050 src/keyring.c:1649
 msgid "Open the file manager"
 msgstr "Ouvrir le gestionnaire de fichiers"
 
-#: src/clipboard.c:985 src/keyring.c:1650
+#: src/clipboard.c:1051 src/keyring.c:1650
 msgid "file manager"
 msgstr "/Fenêtres/_Gestionnaire de fichier"
 
-#: src/clipboard.c:992 src/fileman.c:684 src/keyring.c:1665
+#: src/clipboard.c:1058 src/fileman.c:725 src/keyring.c:1665
 msgid "Help"
 msgstr "Aide"
 
-#: src/clipboard.c:993 src/fileman.c:685 src/keyring.c:1666
+#: 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:994 src/fileman.c:686 src/keyring.c:1667
+#: src/clipboard.c:1060 src/fileman.c:727 src/keyring.c:1667
 msgid "help"
 msgstr "aide"
 
-#: src/clipboard.c:1084
+#: src/clipboard.c:1150
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Privacy Assistant - Presse-papiers"
 
@@ -378,9 +378,9 @@
 msgstr "Expert"
 
 #: 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
+#: 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"
 
@@ -420,86 +420,86 @@
 msgid "_expire on:"
 msgstr "_expire le"
 
-#: src/fileman.c:355 src/fileman.c:953
-msgid "The file is already open."
-msgstr "Le fichier est déjà ouvert."
-
-#: src/fileman.c:516
+#: src/fileman.c:557
 msgid "/File/Sign"
 msgstr "/Fichier/_Signer"
 
-#: src/fileman.c:521
+#: src/fileman.c:562
 msgid "/File/Verify"
 msgstr "/Fichier/Vérifier"
 
-#: src/fileman.c:526
+#: src/fileman.c:567
 msgid "/File/Encrypt"
 msgstr "/Fichier/_Chiffrer"
 
-#: src/fileman.c:531
+#: src/fileman.c:572
 msgid "/File/Decrypt"
 msgstr "/Fichier/_Déchiffrer"
 
-#: src/fileman.c:606
+#: src/fileman.c:647
 msgid "Close all files"
 msgstr "Fermer tous les fichiers"
 
-#: src/fileman.c:606
+#: src/fileman.c:647
 msgid "close files"
 msgstr "fermer fichiers"
 
-#: src/fileman.c:613
+#: src/fileman.c:654
 msgid "Sign the selected file"
 msgstr "Signer le fichier sélectionné"
 
-#: src/fileman.c:614
+#: src/fileman.c:655
 msgid "sign file"
 msgstr "signer fichier"
 
-#: src/fileman.c:624
+#: src/fileman.c:665
 msgid "Check signatures of selected file"
 msgstr "Vérifier les signatures du fichiers sélectionné"
 
-#: src/fileman.c:625
+#: src/fileman.c:666
 msgid "verify file"
 msgstr "vérifier fichier"
 
-#: src/fileman.c:635
+#: src/fileman.c:676
 msgid "Encrypt the selected file"
 msgstr "Chiffrer le fichier sélectionné"
 
-#: src/fileman.c:636
+#: src/fileman.c:677
 msgid "encrypt file"
 msgstr "chiffrer fichier"
 
-#: src/fileman.c:646
+#: src/fileman.c:687
 msgid "Decrypt the selected file"
 msgstr "Déchiffrer le fichier sélectionné"
 
-#: src/fileman.c:647
+#: src/fileman.c:688
 msgid "decrypt file"
 msgstr "déchiffrer fichier"
 
-#: src/fileman.c:676 src/keyring.c:1658
+#: src/fileman.c:717 src/keyring.c:1658
 msgid "Open the clipboard"
 msgstr "Ouvrir le presse-papiers"
 
-#: src/fileman.c:677 src/keyring.c:1659
+#: src/fileman.c:718 src/keyring.c:1659
 msgid "clipboard"
 msgstr "presse-papiers"
 
-#: src/fileman.c:785
+#: src/fileman.c:826
 msgid "File"
 msgstr "Fichier"
 
-#: src/fileman.c:850
+#: src/fileman.c:891
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Gestionnaire de fichiers"
 
-#: src/fileman.c:876
+#: src/fileman.c:917
 msgid "File Manager"
 msgstr "Gestionnaire de fichiers"
 
+#: src/fileman.c:993
+msgid "The file is already open."
+msgstr "Le fichier est déjà ouvert."
+
 #: src/filesigndlg.c:134
 msgid "Sign documents"
 msgstr "Signes les documents"
@@ -520,32 +520,9 @@
 msgid "_detached signature"
 msgstr "signature _détachée"
 
-#: 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 ""
-"Le fichier %s existe déjà.\n"
-"Voulez-vous l'écraser?"
-
-#: 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 "_Oui"
-
-#: 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 "_Non"
-
-#: src/gpabackupop.c:229
-#, c-format
-msgid ""
 "A copy of your secret key has been made to the file:\n"
 "\n"
 "\t\"%s\"\n"
@@ -560,31 +537,19 @@
 "Il s'agit d'une information sensible, qui doit être conservée précieusement\n"
 "(par exemple, sur un autre support (clef USB, etc.) dans un endroit sûr)."
 
-#: src/gpabackupop.c:244
+#: src/gpabackupop.c:223
 msgid "An error ocurred during the backup operation."
 msgstr "Une erreur est survenue lors de l'opération de sauvegarde."
 
-#: src/gpabackupop.c:260
+#: src/gpabackupop.c:245
 msgid "Backup key to file"
 msgstr "Sauvegarder la clef dans le fichier:"
 
-#: src/gpabackupop.c:287
-msgid "Backup Keys"
-msgstr "Sauvegarde des clés"
-
-#: src/gpabackupop.c:311
+#: src/gpabackupop.c:255
 #, c-format
 msgid "Generating backup of key: %s"
 msgstr "Génération de la sauvegarde de clef: %s"
 
-#: src/gpabackupop.c:317
-msgid "_Backup to file:"
-msgstr "Sauvegarder dans le fichier:"
-
-#: src/gpabackupop.c:329
-msgid "B_rowse..."
-msgstr "Pa_rcourir..."
-
 #: src/gpa.c:92
 msgid "Output version information and exit"
 msgstr "Afficher l'information de version et quitter"
@@ -603,7 +568,7 @@
 
 #: src/gpa.c:100
 msgid "Start only the UI server (implies --cms)"
-msgstr "Démarrer seulement le serveur d'interface graphique"
+msgstr "Démarrer seulement le serveur d'interface graphique (implique --cms)"
 
 #: src/gpa.c:102
 msgid "Read options from file"
@@ -625,15 +590,15 @@
 msgid "The keys have been copied to the clipboard."
 msgstr "Les clefs ont été copiées au presse-papiers."
 
-#: src/gpaexportfileop.c:133
+#: src/gpaexportfileop.c:139
 msgid "Export public keys to file"
 msgstr "Exporter des clefs publiques dans le fichier"
 
-#: src/gpaexportfileop.c:137
+#: src/gpaexportfileop.c:150
 msgid "_armor"
 msgstr "_Armure"
 
-#: src/gpaexportfileop.c:171
+#: src/gpaexportfileop.c:182
 #, c-format
 msgid "The keys have been exported to %s."
 msgstr "Les clefs ont été exportées dans %s."
@@ -649,6 +614,18 @@
 "clé publique (\"%s\").\n"
 "Êtes-vous certain de vouloir distribuer cette clé?"
 
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:455
+#: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
+#: src/keydeletedlg.c:93 src/keysigndlg.c:62 src/settingsdlg.c:165
+msgid "_Yes"
+msgstr "_Oui"
+
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:456
+#: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
+#: src/keydeletedlg.c:95 src/keysigndlg.c:64 src/settingsdlg.c:168
+msgid "_No"
+msgstr "_Non"
+
 #: src/gpaexportserverop.c:187
 msgid "The keys have been sent to the server."
 msgstr "Les clés ont été envoyées au serveur."
@@ -677,8 +654,8 @@
 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:727
-#: src/gpafilesignop.c:510 src/gpafileverifyop.c:460 src/gpakeyexpireop.c:235
+#: 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
 msgid "Wrong passphrase!"
 msgstr "Mot de passe incorrect!"
@@ -709,7 +686,7 @@
 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:422
+#: src/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:436
 #: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
 msgid "_Close"
 msgstr "_Fermer"
@@ -727,7 +704,14 @@
 msgid "The following key expired on %s:"
 msgstr "La clef suivante a expiré le %s"
 
-#: src/gpafileencryptop.c:641 src/gpafilesignop.c:414
+#: src/gpafileencryptop.c:596 src/gpafilesignop.c:429
+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
 msgid "You didn't select any key for signing"
 msgstr "Vous n'avez pas sélectionné une clef pour signer"
 
@@ -735,13 +719,6 @@
 msgid "Signing..."
 msgstr "Signature..."
 
-#: 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 "Vérification..."
@@ -763,7 +740,7 @@
 msgid "Generating Key..."
 msgstr "Génération de clef..."
 
-#: src/gpaimportfileop.c:131
+#: src/gpaimportfileop.c:132
 msgid "Import public keys from file"
 msgstr "Importer des clefs publiques d'un fichier"
 
@@ -892,16 +869,16 @@
 msgid "Can authenticate"
 msgstr "Authentifie"
 
-#: 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:830
+#: src/gpgmetools.c:949
 msgid "Revoked"
 msgstr "Révoquée"
 
-#: src/gpasubkeylist.c:141 src/gpgmetools.c:615 src/gpgmetools.c:936
+#: src/gpasubkeylist.c:141 src/gpgmetools.c:624 src/gpgmetools.c:945
 msgid "Expired"
 msgstr "Expirée"
 
-#: src/gpasubkeylist.c:145 src/gpgmetools.c:617
+#: src/gpasubkeylist.c:145 src/gpgmetools.c:626
 msgid "Disabled"
 msgstr "Hors-fonction"
 
@@ -909,11 +886,11 @@
 msgid "Unsigned"
 msgstr "Non-signé"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:927 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:936 src/verifydlg.c:212
 msgid "Valid"
 msgstr "Valide"
 
-#: src/gpawidgets.c:72 src/gpgmetools.c:661 src/gpgmetools.c:668
+#: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
 #: src/keyring.c:1176 src/keysigndlg.c:104
 msgid "User Name:"
 msgstr "Nom d'utilisateur:"
@@ -922,28 +899,28 @@
 msgid "User Names:"
 msgstr "Noms d'utilisateur:"
 
-#: src/gpawidgets.c:78 src/gpgmetools.c:662 src/gpgmetools.c:669
+#: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
 #: src/keyring.c:1178
 msgid "Key ID:"
 msgstr "ID de clef:"
 
-#: src/gpawidgets.c:194
+#: src/gpawidgets.c:180
 msgid "Expiration"
 msgstr "Expiration"
 
-#: src/gpawidgets.c:201
+#: src/gpawidgets.c:187
 msgid "_indefinitely valid"
 msgstr "valide à perpetuité"
 
-#: src/gpawidgets.c:210
+#: src/gpawidgets.c:196
 msgid "expire _after"
 msgstr "expire _après"
 
-#: src/gpawidgets.c:229
+#: src/gpawidgets.c:216
 msgid "expire o_n:"
 msgstr "_expire le"
 
-#: src/gpawidgets.c:302 src/keygendlg.c:295
+#: src/gpawidgets.c:292 src/keygendlg.c:295
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -999,8 +976,17 @@
 "Il s'agit probablement d'un bogue dans le GPA.\n"
 "GPA va tenter de récupérer de cette erreur."
 
-#: src/gpgmetools.c:477
+#: src/gpgmetools.c:139
+#, c-format
 msgid ""
+"The file %s already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Le fichier %s existe déjà.\n"
+"Voulez-vous l'écraser?"
+
+#: 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"
@@ -1013,7 +999,7 @@
 "************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:482
+#: src/gpgmetools.c:491
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
@@ -1021,110 +1007,110 @@
 "La clef sauvegardée dans ce fichier est:\n"
 "\n"
 
-#: src/gpgmetools.c:543
+#: src/gpgmetools.c:552
 msgid "DSA and ElGamal (default)"
 msgstr "DSA et ElGamal (par défaut)"
 
-#: src/gpgmetools.c:544
+#: src/gpgmetools.c:553
 msgid "DSA (sign only)"
 msgstr "DSA (signature seulement)"
 
-#: src/gpgmetools.c:545
+#: src/gpgmetools.c:554
 msgid "RSA (sign only)"
 msgstr "DSA (signature seulement)"
 
-#: 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:941 src/gpgmetools.c:974
 msgid "Unknown"
 msgstr "inconnu"
 
-#: src/gpgmetools.c:584
+#: src/gpgmetools.c:593
 msgid "Never"
 msgstr "Jamais"
 
-#: src/gpgmetools.c:587
+#: src/gpgmetools.c:596
 msgid "Marginal"
 msgstr "Marginale"
 
-#: src/gpgmetools.c:590
+#: src/gpgmetools.c:599
 msgid "Full"
 msgstr "Complète"
 
-#: src/gpgmetools.c:593
+#: src/gpgmetools.c:602
 msgid "Ultimate"
 msgstr "Ultime"
 
-#: src/gpgmetools.c:619
+#: src/gpgmetools.c:628
 msgid "Incomplete"
 msgstr "Incomplet"
 
-#: src/gpgmetools.c:625
+#: src/gpgmetools.c:634
 msgid "Fully Valid"
 msgstr "Complètement valide"
 
-#: src/gpgmetools.c:659
+#: src/gpgmetools.c:668
 msgid "Please enter the passphrase for the following key:"
 msgstr "Veuillez entrer le mot de passe pour la clef suivante:"
 
-#: src/gpgmetools.c:667
+#: src/gpgmetools.c:676
 msgid "Wrong passphrase, please try again:"
 msgstr "Mauvais mot de passe, essayez encore:"
 
-#: src/gpgmetools.c:692
+#: src/gpgmetools.c:701
 msgid "Enter Passphrase"
 msgstr "Entrer le mot de passe"
 
-#: src/gpgmetools.c:814
+#: src/gpgmetools.c:823
 msgid "[None]"
 msgstr "[Aucun]"
 
-#: src/gpgmetools.c:904 src/verifydlg.c:269
+#: src/gpgmetools.c:913 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[ID d'utilisateur inconnu]"
 
-#: src/gpgmetools.c:930 src/verifydlg.c:217
+#: src/gpgmetools.c:939 src/verifydlg.c:217
 msgid "Bad"
 msgstr "Mauvaise"
 
-#: src/gpgmetools.c:953
+#: src/gpgmetools.c:962
 msgid "Generic"
 msgstr "Générique"
 
-#: src/gpgmetools.c:956
+#: src/gpgmetools.c:965
 msgid "Persona"
 msgstr "Personnelle"
 
-#: src/gpgmetools.c:959
+#: src/gpgmetools.c:968
 msgid "Casual"
 msgstr "Informelle"
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:971
 msgid "Positive"
 msgstr "Positive"
 
-#: src/gpgmetools.c:980
+#: src/gpgmetools.c:989
 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:983
+#: src/gpgmetools.c:992
 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:989
+#: src/gpgmetools.c:998
 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:992
+#: src/gpgmetools.c:1001
 msgid "The key can be used only for certification."
 msgstr "La clef peut être utilisée pour fins de certification seulement."
 
-#: src/gpgmetools.c:1000
+#: src/gpgmetools.c:1009
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -1132,15 +1118,15 @@
 "La clef peut être utilisée pour fins de signature et de chiffrement mais pas "
 "de certification."
 
-#: src/gpgmetools.c:1003
+#: src/gpgmetools.c:1012
 msgid "The key can be used only for signing."
 msgstr "La clef peut être utilisée pour fins de signature seulement."
 
-#: src/gpgmetools.c:1008
+#: src/gpgmetools.c:1017
 msgid "The key can be used only for encryption."
 msgstr "La clef peut être utilisée pour fins de chiffrement seulement."
 
-#: src/gpgmetools.c:1011
+#: src/gpgmetools.c:1020
 msgid "This key is useless."
 msgstr "Cette clef est inutilisable."
 
@@ -1148,59 +1134,59 @@
 msgid "GPA Error"
 msgstr "Erreur GPA"
 
-#: src/helpmenu.c:202
+#: src/helpmenu.c:216
 msgid "About GPA"
 msgstr "À propos de GPA"
 
-#: src/helpmenu.c:247
+#: src/helpmenu.c:261
 msgid "Brought to you by:"
 msgstr "Vous est fourni par:"
 
-#: src/helpmenu.c:284
+#: src/helpmenu.c:298
 msgid "GPA is Free Software under the"
 msgstr "GPA est un logiciel libre distribué"
 
-#: src/helpmenu.c:288
+#: src/helpmenu.c:302
 msgid "GNU General Public License."
 msgstr "sous License Générale Publique GNU."
 
-#: src/helpmenu.c:292
+#: src/helpmenu.c:306
 msgid "For news see:"
 msgstr "Pour des nouvelles, voir:"
 
-#: src/helpmenu.c:297
+#: src/helpmenu.c:311
 msgid "http://www.gpg4win.org"
 msgstr "http://www.gpg4win.org"
 
-#: src/helpmenu.c:299
+#: src/helpmenu.c:313
 msgid "http://www.gnupg.org"
 msgstr "http://www.gnupg.org"
 
-#: src/helpmenu.c:382
+#: src/helpmenu.c:396
 msgid "GNU General Public License"
 msgstr "GNU General Gublic License"
 
-#: src/helpmenu.c:409
+#: src/helpmenu.c:423
 msgid "_GNU General Public License"
 msgstr "GNU general public license"
 
-#: src/helpmenu.c:436
+#: src/helpmenu.c:450
 msgid "Show Help Text\n"
 msgstr "Montrer le texte d'aide\n"
 
-#: src/helpmenu.c:444
+#: src/helpmenu.c:458
 msgid "/_Help"
 msgstr "/_Aide"
 
-#: src/helpmenu.c:446
+#: src/helpmenu.c:460
 msgid "/Help/_Contents"
 msgstr "/Aide/_Contenu"
 
-#: src/helpmenu.c:449
+#: src/helpmenu.c:463
 msgid "/Help/_License"
 msgstr "/Aide/_Licence"
 
-#: src/helpmenu.c:450
+#: src/helpmenu.c:464
 msgid "/Help/_About"
 msgstr "/Aide/_À propos"
 
@@ -1264,7 +1250,7 @@
 
 #: src/keygendlg.c:58
 msgid "You must enter a User ID."
-msgstr ""
+msgstr "Vous devez entrer un identificateur d'usager."
 
 #: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
 msgid ""
@@ -1460,10 +1446,14 @@
 #: src/keylist.c:568
 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
 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
 msgid "Owner Trust"
@@ -1475,9 +1465,11 @@
 "holder of the certificate to correctly sign (certify) other certificates.  "
 "It is only meaningful for OpenPGP."
 msgstr ""
+"Vous avez indiqué la Confiance du Propriétaire , cela décrit le niveau de "
+"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
-#, fuzzy
 msgid "Validity"
 msgstr "Validité"
 
@@ -1486,12 +1478,16 @@
 "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 ""
+"La Validité décrit le niveau de confiance attribué par le système à ce "
+"certificat. Ceci indique le niveau de certitude concernant l'identité de cet "
+"utilisateur."
 
 #: src/keylist.c:619
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
 msgstr ""
+"Le Nom d'Usager est le nom mais aussi l'adresse courriel de ce certificat. "
 
 #: src/keyring.c:457
 msgid "No keys selected for signing."
@@ -1865,7 +1861,7 @@
 msgid "Sign only _locally"
 msgstr "Signer seulement en _local"
 
-#: src/options.c:316
+#: src/options.c:312
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -2035,19 +2031,16 @@
 msgstr "Le serveur de clefs que vous avez indiqué n'est pas valide"
 
 #: src/settingsdlg.c:59
-#, fuzzy
 msgid "<b>Default _key</b>"
-msgstr "Clef par _défaut:"
+msgstr "<b>Clef par _défaut</b>"
 
 #: src/settingsdlg.c:111
-#, fuzzy
 msgid "<b>Default key_server</b>"
-msgstr "_Serveur de clefs par défaut:"
+msgstr "<b>_Serveur de clefs par défaut</b>"
 
 #: src/settingsdlg.c:158
-#, fuzzy
 msgid "<b>Use _advanced mode</b>"
-msgstr "Utiliser le mode _avancé:"
+msgstr "<b>Utiliser le mode _avancé</b>"
 
 #: src/settingsdlg.c:193
 msgid "Settings"
@@ -2087,6 +2080,15 @@
 msgid "Signatures:"
 msgstr "Signatures:"
 
+#~ msgid "Backup Keys"
+#~ msgstr "Sauvegarde des clés"
+
+#~ msgid "_Backup to file:"
+#~ msgstr "Sauvegarder dans le fichier:"
+
+#~ msgid "B_rowse..."
+#~ msgstr "Pa_rcourir..."
+
 #~ msgid "GPA Warning"
 #~ msgstr "Avertissement GPA"
 

Modified: trunk/po/ru.po
===================================================================
--- trunk/po/ru.po	2008-03-19 03:36:16 UTC (rev 858)
+++ trunk/po/ru.po	2008-03-20 21:40:36 UTC (rev 859)
@@ -6,310 +6,312 @@
 msgstr ""
 "Project-Id-Version: GPA 0.8\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:34+0100\n"
-"Last-Translator: CJ <cj at neocaching.ru>\n"
+"POT-Creation-Date: 2008-03-20 22:28+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
 
-#: src/clipboard.c:367 src/fileman.c:350
+#: src/clipboard.c:381 src/fileman.c:393
 msgid "Open File"
 msgstr "Открыть файл"
 
-#: src/clipboard.c:395 src/confdialog.c:1266 src/gtktools.c:353
+#: src/clipboard.c:409 src/confdialog.c:1266 src/gtktools.c:353
 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
-#, fuzzy, c-format
+#: src/clipboard.c:426
+#, c-format
 msgid "The file %s is %lli%s large.  Do you really  want to open it?"
-msgstr "Файл %s %lli%s большой. Действительно хотите его открыть?"
+msgstr "Файл %s очень (%lli%s) велик. Действительно хотите его открыть?"
 
-#: src/clipboard.c:481
+#: src/clipboard.c:547
 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/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
 msgid "Clipboard"
 msgstr "Буфер"
 
-#: src/clipboard.c:692 src/fileman.c:472 src/keyring.c:863
+#: src/clipboard.c:758 src/fileman.c:513 src/keyring.c:863
 msgid "/_File"
 msgstr "/_Файл"
 
-#: src/clipboard.c:693 src/fileman.c:474
+#: src/clipboard.c:759 src/fileman.c:515
 msgid "/File/C_lear"
 msgstr "/Файл/О_чистить"
 
-#: src/clipboard.c:694 src/fileman.c:473
+#: src/clipboard.c:760 src/fileman.c:514
 msgid "/File/_Open"
 msgstr "/Файл/_Открыть"
 
-#: src/clipboard.c:695
+#: src/clipboard.c:761
 msgid "/File/Save _As"
 msgstr "/Файл/Со_хранить как"
 
-#: src/clipboard.c:697 src/fileman.c:475
+#: src/clipboard.c:763 src/fileman.c:516
 msgid "/File/sep1"
 msgstr "/Файл/sep1"
 
-#: src/clipboard.c:698 src/fileman.c:476
+#: src/clipboard.c:764 src/fileman.c:517
 msgid "/File/_Sign"
 msgstr "/Файл/_Подписать"
 
-#: src/clipboard.c:699 src/fileman.c:477
+#: src/clipboard.c:765 src/fileman.c:518
 msgid "/File/_Verify"
 msgstr "/Файл/Пров_ерить"
 
-#: src/clipboard.c:700 src/fileman.c:478
+#: src/clipboard.c:766 src/fileman.c:519
 msgid "/File/_Encrypt"
 msgstr "/Файл/_Зашифровать"
 
-#: src/clipboard.c:701 src/fileman.c:479
+#: src/clipboard.c:767 src/fileman.c:520
 msgid "/File/_Decrypt"
 msgstr "/Файл/_Расшифровать"
 
-#: src/clipboard.c:702 src/fileman.c:480
+#: src/clipboard.c:768 src/fileman.c:521
 msgid "/File/sep2"
 msgstr "/Файл/sep2"
 
-#: src/clipboard.c:703 src/fileman.c:481 src/keyring.c:864
+#: src/clipboard.c:769 src/fileman.c:522 src/keyring.c:864
 msgid "/File/_Close"
 msgstr "/Файл/За_крыть"
 
-#: src/clipboard.c:704 src/fileman.c:482 src/keyring.c:866
+#: src/clipboard.c:770 src/fileman.c:523 src/keyring.c:866
 msgid "/File/_Quit"
 msgstr "/Файл/_Выйти"
 
-#: src/clipboard.c:707 src/fileman.c:485 src/keyring.c:869
+#: src/clipboard.c:773 src/fileman.c:526 src/keyring.c:869
 msgid "/_Edit"
 msgstr "/_Правка"
 
-#: src/clipboard.c:710
+#: src/clipboard.c:776
 msgid "/Edit/_Undo"
 msgstr "/Правка/_Отменить"
 
-#: src/clipboard.c:711
+#: src/clipboard.c:777
 msgid "/Edit/_Redo"
 msgstr "/Правка/В_ернуть"
 
-#: src/clipboard.c:712
+#: src/clipboard.c:778
 msgid "/Edit/sep0"
 msgstr "/Edit/sep0"
 
-#: src/clipboard.c:714 src/clipboard.c:750
+#: src/clipboard.c:780 src/clipboard.c:816
 msgid "/Edit/Cut"
 msgstr "/Правка/Вырезать"
 
-#: src/clipboard.c:715 src/keyring.c:870
+#: src/clipboard.c:781 src/keyring.c:870
 msgid "/Edit/_Copy"
 msgstr "/Правка/_Копировать"
 
-#: src/clipboard.c:716 src/keyring.c:872
+#: src/clipboard.c:782 src/keyring.c:872
 msgid "/Edit/_Paste"
 msgstr "/Правка/_Вставить"
 
-#: src/clipboard.c:717
+#: src/clipboard.c:783
 msgid "/Edit/_Delete"
 msgstr "/Правка/_Удалить"
 
-#: src/clipboard.c:718 src/keyring.c:874
+#: src/clipboard.c:784 src/keyring.c:874
 msgid "/Edit/sep1"
 msgstr "/Правка/sep1"
 
-#: src/clipboard.c:719 src/fileman.c:486 src/keyring.c:875
+#: src/clipboard.c:785 src/fileman.c:527 src/keyring.c:875
 msgid "/Edit/Select _All"
 msgstr "/Правка/Вы_брать все"
 
-#: src/clipboard.c:721 src/fileman.c:487 src/keyring.c:876
+#: src/clipboard.c:787 src/fileman.c:528 src/keyring.c:876
 msgid "/Edit/sep2"
 msgstr "/Правка/sep2"
 
-#: src/clipboard.c:722 src/fileman.c:488 src/keyring.c:877
+#: src/clipboard.c:788 src/fileman.c:529 src/keyring.c:877
 msgid "/Edit/Pr_eferences..."
 msgstr "/Правка/_Настройки..."
 
-#: src/clipboard.c:724 src/fileman.c:490 src/keyring.c:879
+#: src/clipboard.c:790 src/fileman.c:531 src/keyring.c:879
 msgid "/Edit/_Backend Preferences..."
 msgstr "/Правка/Настройки _шифр. программы..."
 
-#: src/clipboard.c:728 src/fileman.c:494 src/keyring.c:906
+#: src/clipboard.c:794 src/fileman.c:535 src/keyring.c:906
 msgid "/_Windows"
 msgstr "/_Окно"
 
-#: src/clipboard.c:729 src/fileman.c:495 src/keyring.c:907
+#: src/clipboard.c:795 src/fileman.c:536 src/keyring.c:907
 msgid "/Windows/_Keyring Editor"
 msgstr "/Окно/Менеджер _ключей"
 
-#: src/clipboard.c:730 src/fileman.c:496
+#: src/clipboard.c:796 src/fileman.c:537
 msgid "/Windows/_Filemanager"
 msgstr "/Окно/Менеджер _файлов"
 
-#: src/clipboard.c:731 src/fileman.c:497 src/keyring.c:909
+#: src/clipboard.c:797 src/fileman.c:538 src/keyring.c:909
 msgid "/Windows/_Clipboard"
 msgstr "/Окно/_Буфер"
 
-#: src/clipboard.c:758 src/keyring.c:948
+#: src/clipboard.c:824 src/keyring.c:948
 msgid "/Edit/Copy"
 msgstr "/Правка/_Копировать"
 
-#: src/clipboard.c:766
+#: src/clipboard.c:832
 msgid "/Edit/Delete"
 msgstr "/Правка/_Удалить"
 
-#: src/clipboard.c:774
+#: src/clipboard.c:840
 msgid "/Edit/Paste"
 msgstr "/Правка/_Вставить"
 
-#: src/clipboard.c:879
+#: src/clipboard.c:945
 msgid "Clear buffer"
 msgstr "Очистить буфер"
 
-#: src/clipboard.c:879
+#: src/clipboard.c:945
 msgid "clear buffer"
 msgstr "очистить буфер"
 
-#: src/clipboard.c:887 src/fileman.c:602
+#: src/clipboard.c:953 src/fileman.c:643
 msgid "Open a file"
 msgstr "Открыть файл"
 
-#: src/clipboard.c:887 src/fileman.c:602
+#: src/clipboard.c:953 src/fileman.c:643
 msgid "open file"
 msgstr "открыть файл"
 
-#: src/clipboard.c:892
+#: src/clipboard.c:958
 msgid "Save to a file"
 msgstr "Сохранить в файле"
 
-#: src/clipboard.c:892
+#: src/clipboard.c:958
 msgid "save file as"
 msgstr "сохранить файл как"
 
-#: src/clipboard.c:900
+#: src/clipboard.c:966
 msgid "Cut the selection"
 msgstr "Вырезать выделенное в буфер"
 
-#: src/clipboard.c:901
+#: src/clipboard.c:967
 msgid "cut the selection"
 msgstr "вырезать выделенное в буфер"
 
-#: src/clipboard.c:907
+#: src/clipboard.c:973
 msgid "Copy the selection"
 msgstr "Копировать выделенное в буфер"
 
-#: src/clipboard.c:908
+#: src/clipboard.c:974
 msgid "copy the selection"
 msgstr "копировать выделенное в буфер"
 
-#: src/clipboard.c:914
+#: src/clipboard.c:980
 msgid "Paste the clipboard"
 msgstr "Вставить из буфера"
 
-#: src/clipboard.c:915
+#: src/clipboard.c:981
 msgid "paste the clipboard"
 msgstr "вставить из буфера"
 
-#: src/clipboard.c:925 src/fileman.c:612 src/keyring.c:1570
+#: src/clipboard.c:991 src/fileman.c:653 src/keyring.c:1570
 msgid "Sign"
 msgstr "Подписать"
 
-#: src/clipboard.c:926
+#: src/clipboard.c:992
 msgid "Sign the selected text"
 msgstr "Подписать выбранный текст"
 
-#: src/clipboard.c:927
+#: src/clipboard.c:993
 msgid "sign text"
 msgstr "подписать текст"
 
-#: src/clipboard.c:935 src/fileman.c:623
+#: src/clipboard.c:1001 src/fileman.c:664
 msgid "Verify"
 msgstr "Проверить"
 
-#: src/clipboard.c:936
+#: src/clipboard.c:1002
 msgid "Check signatures of selected text"
 msgstr "Проверить подпись выбранного текста"
 
-#: src/clipboard.c:937
+#: src/clipboard.c:1003
 msgid "verify text"
 msgstr "проверить текст"
 
-#: src/clipboard.c:945 src/fileman.c:634
+#: src/clipboard.c:1011 src/fileman.c:675
 msgid "Encrypt"
 msgstr "Зашифровать"
 
-#: src/clipboard.c:946
+#: src/clipboard.c:1012
 msgid "Encrypt the selected text"
 msgstr "Зашифровать выбранный текст"
 
-#: src/clipboard.c:947
+#: src/clipboard.c:1013
 msgid "encrypt text"
 msgstr "зашифровать текст"
 
-#: src/clipboard.c:955 src/fileman.c:645
+#: src/clipboard.c:1021 src/fileman.c:686
 msgid "Decrypt"
 msgstr "Расшифровать"
 
-#: src/clipboard.c:956
+#: src/clipboard.c:1022
 msgid "Decrypt the selected text"
 msgstr "Расшифровать выбранный текст"
 
-#: src/clipboard.c:957
+#: src/clipboard.c:1023
 msgid "decrypt text"
 msgstr "расшифровать текст"
 
-#: src/clipboard.c:967 src/fileman.c:658 src/keyring.c:1631
+#: src/clipboard.c:1033 src/fileman.c:699 src/keyring.c:1631
 msgid "Open the preferences dialog"
 msgstr "Открыть окно настроек"
 
-#: src/clipboard.c:968 src/fileman.c:659 src/keyring.c:1632
+#: src/clipboard.c:1034 src/fileman.c:700 src/keyring.c:1632
 msgid "preferences"
 msgstr "предпочтения"
 
-#: src/clipboard.c:975 src/fileman.c:666
+#: src/clipboard.c:1041 src/fileman.c:707
 msgid "Keyring"
-msgstr "Связка ключей"
+msgstr "Ключи"
 
-#: src/clipboard.c:976 src/fileman.c:667
+#: src/clipboard.c:1042 src/fileman.c:708
 msgid "Open the keyring editor"
 msgstr "Открыть менеджер ключей"
 
-#: src/clipboard.c:977 src/fileman.c:668
+#: src/clipboard.c:1043 src/fileman.c:709
 msgid "keyring editor"
 msgstr "менеджер ключей"
 
-#: src/clipboard.c:983 src/keyring.c:1648
+#: src/clipboard.c:1049 src/keyring.c:1648
 msgid "Files"
 msgstr "Файлы"
 
-#: src/clipboard.c:984 src/keyring.c:1649
+#: src/clipboard.c:1050 src/keyring.c:1649
 msgid "Open the file manager"
 msgstr "Открыть менеджер файлов"
 
-#: src/clipboard.c:985 src/keyring.c:1650
+#: src/clipboard.c:1051 src/keyring.c:1650
 msgid "file manager"
 msgstr "менеджер файлов"
 
-#: src/clipboard.c:992 src/fileman.c:684 src/keyring.c:1665
+#: src/clipboard.c:1058 src/fileman.c:725 src/keyring.c:1665
 msgid "Help"
 msgstr "Справка"
 
-#: src/clipboard.c:993 src/fileman.c:685 src/keyring.c:1666
+#: 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:994 src/fileman.c:686 src/keyring.c:1667
+#: src/clipboard.c:1060 src/fileman.c:727 src/keyring.c:1667
 msgid "help"
 msgstr "справка"
 
-#: src/clipboard.c:1084
+#: src/clipboard.c:1150
 msgid "GNU Privacy Assistant - Clipboard"
 msgstr "GNU Privacy Assistant - Буфер"
 
@@ -378,9 +380,9 @@
 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
+#: 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 "От_мена"
 
@@ -420,86 +422,86 @@
 msgid "_expire on:"
 msgstr "_годен до:"
 
-#: src/fileman.c:355 src/fileman.c:953
-msgid "The file is already open."
-msgstr "Файл уже открыт."
-
-#: src/fileman.c:516
+#: src/fileman.c:557
 msgid "/File/Sign"
 msgstr "/Файл/Подписать"
 
-#: src/fileman.c:521
+#: src/fileman.c:562
 msgid "/File/Verify"
 msgstr "/Файл/Проверить"
 
-#: src/fileman.c:526
+#: src/fileman.c:567
 msgid "/File/Encrypt"
 msgstr "/Файл/Зашифровать"
 
-#: src/fileman.c:531
+#: src/fileman.c:572
 msgid "/File/Decrypt"
 msgstr "/Файл/Расшифровать"
 
-#: src/fileman.c:606
+#: src/fileman.c:647
 msgid "Close all files"
 msgstr "Закрыть все файлы"
 
-#: src/fileman.c:606
+#: src/fileman.c:647
 msgid "close files"
 msgstr "закрыть файлы"
 
-#: src/fileman.c:613
+#: src/fileman.c:654
 msgid "Sign the selected file"
 msgstr "Подписать выбранный файл"
 
-#: src/fileman.c:614
+#: src/fileman.c:655
 msgid "sign file"
 msgstr "подписать файл"
 
-#: src/fileman.c:624
+#: src/fileman.c:665
 msgid "Check signatures of selected file"
 msgstr "Проверить подписи выбранного файла"
 
-#: src/fileman.c:625
+#: src/fileman.c:666
 msgid "verify file"
 msgstr "проверить файл"
 
-#: src/fileman.c:635
+#: src/fileman.c:676
 msgid "Encrypt the selected file"
 msgstr "Зашифровать выбранный файл"
 
-#: src/fileman.c:636
+#: src/fileman.c:677
 msgid "encrypt file"
 msgstr "зашифровать файл"
 
-#: src/fileman.c:646
+#: src/fileman.c:687
 msgid "Decrypt the selected file"
 msgstr "Расшифровать выбранный файл"
 
-#: src/fileman.c:647
+#: src/fileman.c:688
 msgid "decrypt file"
 msgstr "расшифровать файл"
 
-#: src/fileman.c:676 src/keyring.c:1658
+#: src/fileman.c:717 src/keyring.c:1658
 msgid "Open the clipboard"
 msgstr "Открыть буфер"
 
-#: src/fileman.c:677 src/keyring.c:1659
+#: src/fileman.c:718 src/keyring.c:1659
 msgid "clipboard"
 msgstr "буфер"
 
-#: src/fileman.c:785
+#: src/fileman.c:826
 msgid "File"
 msgstr "Файл"
 
-#: src/fileman.c:850
+#: src/fileman.c:891
 msgid "GNU Privacy Assistant - File Manager"
 msgstr "GNU Privacy Assistant - Менеджер файлов"
 
-#: src/fileman.c:876
+#: src/fileman.c:917
 msgid "File Manager"
-msgstr "Менеджер файлов"
+msgstr "Менеджер _файлов"
 
+#: src/fileman.c:993
+msgid "The file is already open."
+msgstr "Файл уже открыт."
+
 #: src/filesigndlg.c:134
 msgid "Sign documents"
 msgstr "Подпись файлов"
@@ -520,32 +522,9 @@
 msgid "_detached signature"
 msgstr "_отделяемая подпись"
 
-#: 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 "Да"
-
-#: 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 "Нет"
-
-#: src/gpabackupop.c:229
-#, c-format
-msgid ""
 "A copy of your secret key has been made to the file:\n"
 "\n"
 "\t\"%s\"\n"
@@ -560,31 +539,19 @@
 "Это деликатная иформация, ее следует тщательно оберегать\n"
 "(храните на сменном носителе CD/DVD/Flash в надежном и безопасном месте)."
 
-#: 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 "_Сохранить в:"
-
-#: src/gpabackupop.c:329
-msgid "B_rowse..."
-msgstr "Об_зор..."
-
 #: src/gpa.c:92
 msgid "Output version information and exit"
 msgstr "Показать информацию о версии и завершить"
@@ -625,15 +592,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 "_защитить"
 
-#: src/gpaexportfileop.c:171
+#: src/gpaexportfileop.c:182
 #, c-format
 msgid "The keys have been exported to %s."
 msgstr "Ключи экспортированы в %s."
@@ -649,6 +616,18 @@
 "(\"%s\").\n"
 "Действительно хотите распространить данный ключ?"
 
+#: src/gpaexportserverop.c:134 src/gpafileencryptop.c:455
+#: src/gpafileverifyop.c:178 src/gpgmetools.c:142 src/keydeletedlg.c:44
+#: src/keydeletedlg.c:93 src/keysigndlg.c:62 src/settingsdlg.c:165
+msgid "_Yes"
+msgstr "Да"
+
+#: src/gpaexportserverop.c:135 src/gpafileencryptop.c:456
+#: src/gpafileverifyop.c:179 src/gpgmetools.c:143 src/keydeletedlg.c:46
+#: src/keydeletedlg.c:95 src/keysigndlg.c:64 src/settingsdlg.c:168
+msgid "_No"
+msgstr "Нет"
+
 #: src/gpaexportserverop.c:187
 msgid "The keys have been sent to the server."
 msgstr "Ключи успешно отправлены на сервер."
@@ -677,8 +656,8 @@
 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/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
 msgid "Wrong passphrase!"
 msgstr "Неверный пароль!"
@@ -708,7 +687,7 @@
 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/gtktools.c:324 src/gtktools.c:357 src/helpmenu.c:436
 #: src/keyeditdlg.c:151 src/settingsdlg.c:194 src/verifydlg.c:115
 msgid "_Close"
 msgstr "_Закрыть"
@@ -726,7 +705,14 @@
 msgid "The following key expired on %s:"
 msgstr "Срок годности ключа истек %s:"
 
-#: src/gpafileencryptop.c:641 src/gpafilesignop.c:414
+#: src/gpafileencryptop.c:596 src/gpafilesignop.c:429
+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
 msgid "You didn't select any key for signing"
 msgstr "Не выбран ключ для подписи"
 
@@ -734,13 +720,6 @@
 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 "Проверка..."
@@ -762,7 +741,7 @@
 msgid "Generating Key..."
 msgstr "Создание ключа..."
 
-#: src/gpaimportfileop.c:131
+#: src/gpaimportfileop.c:132
 msgid "Import public keys from file"
 msgstr "Импорт открытого ключа из файла"
 
@@ -847,7 +826,7 @@
 
 #: src/gparecvkeydlg.c:101
 msgid "Which key do you want to import? (The key must be specified by key ID)."
-msgstr "Какой ключ импортировать? (Нужно указать ID ключа)."
+msgstr "Какой ключ импортировать (ID ключа)?"
 
 #: src/gparecvkeydlg.c:116
 msgid "Key _ID:"
@@ -889,16 +868,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:830
+#: src/gpgmetools.c:949
 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:945
 msgid "Expired"
 msgstr "Истек"
 
-#: src/gpasubkeylist.c:145 src/gpgmetools.c:617
+#: src/gpasubkeylist.c:145 src/gpgmetools.c:626
 msgid "Disabled"
 msgstr "Отключен"
 
@@ -906,11 +885,11 @@
 msgid "Unsigned"
 msgstr "Неподписан"
 
-#: src/gpasubkeylist.c:153 src/gpgmetools.c:927 src/verifydlg.c:212
+#: src/gpasubkeylist.c:153 src/gpgmetools.c:936 src/verifydlg.c:212
 msgid "Valid"
 msgstr "Достоверно"
 
-#: src/gpawidgets.c:72 src/gpgmetools.c:661 src/gpgmetools.c:668
+#: src/gpawidgets.c:72 src/gpgmetools.c:670 src/gpgmetools.c:677
 #: src/keyring.c:1176 src/keysigndlg.c:104
 msgid "User Name:"
 msgstr "Имя:"
@@ -919,28 +898,28 @@
 msgid "User Names:"
 msgstr "Имена:"
 
-#: src/gpawidgets.c:78 src/gpgmetools.c:662 src/gpgmetools.c:669
+#: src/gpawidgets.c:78 src/gpgmetools.c:671 src/gpgmetools.c:678
 #: src/keyring.c:1178
 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 "_не вполне достоверен"
 
-#: src/gpawidgets.c:210
+#: src/gpawidgets.c:196
 msgid "expire _after"
 msgstr "недействителен после"
 
-#: src/gpawidgets.c:229
+#: src/gpawidgets.c:216
 msgid "expire o_n:"
 msgstr "недействителен с:"
 
-#: src/gpawidgets.c:302 src/keygendlg.c:295
+#: src/gpawidgets.c:292 src/keygendlg.c:295
 msgid ""
 "!FATAL ERROR!\n"
 "Invalid insert mode for expiry date."
@@ -996,8 +975,17 @@
 "Возможно, ошибка в программе GPA.\n"
 "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 ""
+"Файл %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"
@@ -1010,116 +998,116 @@
 "****************************************************************************\n"
 "\n"
 
-#: src/gpgmetools.c:482
+#: src/gpgmetools.c:491
 msgid ""
 "The key backed up in this file is:\n"
 "\n"
 msgstr ""
-"Резервная копия сохранена в файл:\n"
+"Резервная копия сохранена в файле:\n"
 "\n"
 
-#: src/gpgmetools.c:543
+#: src/gpgmetools.c:552
 msgid "DSA and ElGamal (default)"
 msgstr "DSA и ElGamal (по умолчанию)"
 
-#: 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:941 src/gpgmetools.c:974
 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 "Введите пароль доступа к ключу:"
+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:823
 msgid "[None]"
 msgstr "[Нет]"
 
-#: src/gpgmetools.c:904 src/verifydlg.c:269
+#: src/gpgmetools.c:913 src/verifydlg.c:269
 msgid "[Unknown user ID]"
 msgstr "[Неизвестный ID пользователя]"
 
-#: src/gpgmetools.c:930 src/verifydlg.c:217
+#: src/gpgmetools.c:939 src/verifydlg.c:217
 msgid "Bad"
 msgstr "Плохой"
 
-#: src/gpgmetools.c:953
+#: src/gpgmetools.c:962
 msgid "Generic"
 msgstr "Общий"
 
-#: src/gpgmetools.c:956
+#: src/gpgmetools.c:965
 msgid "Persona"
 msgstr "Персон."
 
-#: src/gpgmetools.c:959
+#: src/gpgmetools.c:968
 msgid "Casual"
 msgstr "Случайн."
 
-#: src/gpgmetools.c:962
+#: src/gpgmetools.c:971
 msgid "Positive"
 msgstr "Позитив."
 
-#: src/gpgmetools.c:980
+#: src/gpgmetools.c:989
 msgid "The key can be used for certification, signing and encryption."
 msgstr ""
 "Ключ может быть использован для сертифицирования, подписи и шифрования."
 
-#: src/gpgmetools.c:983
+#: src/gpgmetools.c:992
 msgid ""
 "The key can be used for certification and signing, but not for encryption."
 msgstr ""
 "Ключ может быть использован для сертифицирования и подписи, но не для "
 "шифрования."
 
-#: src/gpgmetools.c:989
+#: src/gpgmetools.c:998
 msgid "The key can be used for certification and encryption."
 msgstr "Ключ может быть использован для сертифицирования и шифрования."
 
-#: src/gpgmetools.c:992
+#: src/gpgmetools.c:1001
 msgid "The key can be used only for certification."
 msgstr "Ключ может быть использован только для сертифицирования."
 
-#: src/gpgmetools.c:1000
+#: src/gpgmetools.c:1009
 msgid ""
 "The key can be used only for signing and encryption, but not for "
 "certification."
@@ -1127,15 +1115,15 @@
 "Ключ может быть использован для подписи и шифрования, но не для "
 "сертифицирования."
 
-#: src/gpgmetools.c:1003
+#: src/gpgmetools.c:1012
 msgid "The key can be used only for signing."
 msgstr "Ключ может быть использован только для подписи."
 
-#: src/gpgmetools.c:1008
+#: src/gpgmetools.c:1017
 msgid "The key can be used only for encryption."
 msgstr "Ключ может быть использован только для шифрования."
 
-#: src/gpgmetools.c:1011
+#: src/gpgmetools.c:1020
 msgid "This key is useless."
 msgstr "Данный ключ бесполезен/неприменим."
 
@@ -1143,59 +1131,59 @@
 msgid "GPA Error"
 msgstr "Ошибка GPA"
 
-#: src/helpmenu.c:202
+#: src/helpmenu.c:216
 msgid "About GPA"
 msgstr "О программе GPA"
 
-#: src/helpmenu.c:247
+#: src/helpmenu.c:261
 msgid "Brought to you by:"
 msgstr "Предоставлен:"
 
-#: src/helpmenu.c:284
+#: src/helpmenu.c:298
 msgid "GPA is Free Software under the"
 msgstr "GPA - бесплатная программа по лицензии"
 
-#: src/helpmenu.c:288
+#: src/helpmenu.c:302
 msgid "GNU General Public License."
 msgstr "GNU General Public License."
 
-#: src/helpmenu.c:292
+#: src/helpmenu.c:306
 msgid "For news see:"
 msgstr "Обновления:"
 
-#: src/helpmenu.c:297
+#: src/helpmenu.c:311
 msgid "http://www.gpg4win.org"
 msgstr "http://www.gpg4win.org"
 
-#: src/helpmenu.c:299
+#: src/helpmenu.c:313
 msgid "http://www.gnupg.org"
 msgstr "http://www.gnupg.org"
 
-#: src/helpmenu.c:382
+#: src/helpmenu.c:396
 msgid "GNU General Public License"
 msgstr "GNU General Public License"
 
-#: src/helpmenu.c:409
+#: src/helpmenu.c:423
 msgid "_GNU General Public License"
 msgstr "_GNU General Public License"
 
-#: src/helpmenu.c:436
+#: src/helpmenu.c:450
 msgid "Show Help Text\n"
 msgstr "Показать подсказки\n"
 
-#: src/helpmenu.c:444
+#: src/helpmenu.c:458
 msgid "/_Help"
 msgstr "/Сп_равка"
 
-#: src/helpmenu.c:446
+#: src/helpmenu.c:460
 msgid "/Help/_Contents"
 msgstr "/Справка/_Содержание"
 
-#: src/helpmenu.c:449
+#: src/helpmenu.c:463
 msgid "/Help/_License"
 msgstr "/Справка/_Лицензия"
 
-#: src/helpmenu.c:450
+#: src/helpmenu.c:464
 msgid "/Help/_About"
 msgstr "/Справка/_О программе"
 
@@ -1228,8 +1216,8 @@
 "This key has a secret key. Deleting this key cannot be undone, unless you "
 "have a backup copy."
 msgstr ""
-"Это закрытый ключ. Восстановить закрытый ключ можно только из резервной "
-"копии (если она есть)."
+"Присутствует закрытый ключ. Восстановить его можно только из резервной копии "
+"(если она есть)."
 
 #: src/keydeletedlg.c:123
 msgid ""
@@ -1258,7 +1246,7 @@
 
 #: src/keygendlg.c:58
 msgid "You must enter a User ID."
-msgstr ""
+msgstr "Введите ID пользователя."
 
 #: src/keygendlg.c:63 src/keygenwizard.c:307 src/passwddlg.c:45
 msgid ""
@@ -1322,7 +1310,7 @@
 
 #: src/keygendlg.c:216
 msgid "_User ID: "
-msgstr "ID _пользователя"
+msgstr "Имя пользователя"
 
 #: src/keygendlg.c:226
 msgid "_Email: "
@@ -1452,11 +1440,11 @@
 
 #: src/keylist.c:568
 msgid "The key ID is a short number to identify a certificate."
-msgstr ""
+msgstr "ID ключа - короткий номер для идентификации сертификата."
 
 #: src/keylist.c:581
 msgid "The Expiry Date is the date until the certificate is valid."
-msgstr ""
+msgstr "Срок годности определяет продолжительность действия сертификата."
 
 #: src/keylist.c:591 src/ownertrustdlg.c:122
 msgid "Owner Trust"
@@ -1468,23 +1456,27 @@
 "holder of the certificate to correctly sign (certify) other certificates.  "
 "It is only meaningful for OpenPGP."
 msgstr ""
+"Доверие владельцу - значение, устанавливаемое вами. Вы определяете, "
+"насколько доверяете владельцу сертификата подписывать другие сертификаты. "
+"(Актуально только для OpenPGP)."
 
 #: src/keylist.c:604
-#, fuzzy
 msgid "Validity"
-msgstr "Достоверность ключа"
+msgstr "Достоверность"
 
 #: src/keylist.c:605
 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
 msgid ""
 "The User Name is the name and often also the email address  of the "
 "certificate."
-msgstr ""
+msgstr "Имя владельца сертификата и (часто) его электронный адрес."
 
 #: src/keyring.c:457
 msgid "No keys selected for signing."
@@ -1859,7 +1851,7 @@
 msgid "Sign only _locally"
 msgstr "Подписать только локально"
 
-#: src/options.c:316
+#: src/options.c:312
 msgid ""
 "The private key you selected as default is no longer available.\n"
 "GPA will try to choose a new default key automatically."
@@ -1884,7 +1876,7 @@
 
 #: src/ownertrustdlg.c:145
 msgid "_Never"
-msgstr "Никогда"
+msgstr "Нет"
 
 #: src/ownertrustdlg.c:150
 msgid ""
@@ -1894,7 +1886,7 @@
 
 #: src/ownertrustdlg.c:160
 msgid "_Marginal"
-msgstr "Ограниченно"
+msgstr "Ограниченное"
 
 #: src/ownertrustdlg.c:165
 msgid ""
@@ -1937,8 +1929,8 @@
 "Пользователь обладает абсолютным доверием. Подписанные им чужие ключи можно "
 "считать полностью достоверными.\n"
 "\n"
-"(Внимание: этот уровень доверия- для ваших ключей. Не используйте его для "
-"других ключей, если не доверяете этим ключам и их владельцам на 100%)\n"
+"(Абсолютное доверие - для ваших ключей. Не используйте его для других "
+"ключей, если не доверяете этим ключам и их владельцам на 100%)\n"
 
 #: src/passwddlg.c:96
 msgid "Choose new passphrase"
@@ -2021,23 +2013,20 @@
 msgstr "Некорректно задан сервер ключей"
 
 #: src/settingsdlg.c:59
-#, fuzzy
 msgid "<b>Default _key</b>"
-msgstr "_Ключ по умолчанию:"
+msgstr "<b>_Ключ по умолчанию</b>"
 
 #: src/settingsdlg.c:111
-#, fuzzy
 msgid "<b>Default key_server</b>"
-msgstr "_Сервер ключей по умолчанию:"
+msgstr "<b>_Сервер ключей по умолчанию</b>"
 
 #: src/settingsdlg.c:158
-#, fuzzy
 msgid "<b>Use _advanced mode</b>"
-msgstr "Рас_ширенный режим:"
+msgstr "<b>Рас_ширенный режим</b>"
 
 #: src/settingsdlg.c:193
 msgid "Settings"
-msgstr "Параметры"
+msgstr "Настройки"
 
 #: src/siglist.c:128
 msgid "Level"
@@ -2045,7 +2034,7 @@
 
 #: src/siglist.c:135
 msgid "Local"
-msgstr "Локальная"
+msgstr "Локал."
 
 #: src/verifydlg.c:116
 msgid "Verify documents"
@@ -2073,22 +2062,3 @@
 msgid "Signatures:"
 msgstr "Подписи:"
 
-#~ msgid "GPA Warning"
-#~ msgstr "Предупреждение GPA"
-
-#~ msgid ""
-#~ "One of your secret keys contains an ElGamal signing key. Due to a bug in "
-#~ "GnuPG, all ElGamal keys used with GnuPG 1.0.2 and later must be "
-#~ "considered compromised.\n"
-#~ "\n"
-#~ "Please revoke your key as soon as possible.\n"
-#~ "\n"
-#~ "The affected key is:"
-#~ msgstr ""
-#~ "Один из ваших закрытых ключей подписан ключом ElGamal. Из-за ошибки в "
-#~ "GnuPG все ключи ElGamal версии GnuPG 1.0.2 и более новых версий следует "
-#~ "считать скомпрометированными.\n"
-#~ "\n"
-#~ "Следует отозвать такой ключ как можно скорее.\n"
-#~ "\n"
-#~ "Соответствующие ключи:"



More information about the Gpa-commits mailing list