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

scm-commit at wald.intevation.org scm-commit at wald.intevation.org
Tue Jan 17 11:56:56 CET 2006


Author: werner
Date: 2006-01-17 11:56:54 +0100 (Tue, 17 Jan 2006)
New Revision: 738

Modified:
   trunk/po/de.po
   trunk/po/es.po
   trunk/po/fr.po
   trunk/po/ja.po
   trunk/po/nl.po
   trunk/po/pl.po
   trunk/po/pt_BR.po
   trunk/po/sv.po
   trunk/po/tr.po
   trunk/po/zh_TW.Big5.po
   trunk/src/ChangeLog
   trunk/src/encryptdlg.c
   trunk/src/expirydlg.c
   trunk/src/filesigndlg.c
   trunk/src/gpabackupop.c
   trunk/src/gpaexportserverop.c
   trunk/src/gpafileencryptop.c
   trunk/src/gpafileverifyop.c
   trunk/src/gpaprogressdlg.c
   trunk/src/gparecvkeydlg.c
   trunk/src/gpgmetools.c
   trunk/src/gtktools.c
   trunk/src/keydeletedlg.c
   trunk/src/keyeditdlg.c
   trunk/src/keygendlg.c
   trunk/src/keylist.c
   trunk/src/keysigndlg.c
   trunk/src/ownertrustdlg.c
   trunk/src/passwddlg.c
   trunk/src/settingsdlg.c
   trunk/src/verifydlg.c
Log:
translation fixes


Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/po/de.po	2006-01-17 10:56:54 UTC (rev 738)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-11 10:08+0100\n"
+"POT-Creation-Date: 2006-01-17 10:18+0100\n"
 "PO-Revision-Date: 2006-01-13 09:37+0100\n"
 "Last-Translator: Steffen Michalek <steffen at michalek.de>\n"
 "Language-Team: deutsch <de at li.org>\n"
@@ -15,6 +15,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
+#: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
+#: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
+#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/ownertrustdlg.c:110 src/passwddlg.c:98
+msgid "_Cancel"
+msgstr "_Abbrechen"
+
 #: src/encryptdlg.c:135
 msgid "Encrypt files"
 msgstr "Dateien verschlüsseln"
@@ -272,6 +279,20 @@
 "Die Datei »%s« existiert bereits.\n"
 "Möchten Sie sie überschreiben?"
 
+#: src/gpabackupop.c:218 src/gpaexportserverop.c:132
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
+#: src/settingsdlg.c:136
+msgid "_Yes"
+msgstr "_Ja"
+
+#: src/gpabackupop.c:219 src/gpaexportserverop.c:133
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
+#: src/settingsdlg.c:139
+msgid "_No"
+msgstr "_Nein"
+
 #: src/gpabackupop.c:231
 #, c-format
 msgid ""
@@ -427,6 +448,13 @@
 msgid "Revoked Key"
 msgstr "Zurückgezogener Schlüssel"
 
+#: src/gpafileencryptop.c:346 src/gpafileencryptop.c:386 src/gpawizard.c:279
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/keyeditdlg.c:150 src/keylist.c:499 src/settingsdlg.c:166
+#: src/verifydlg.c:117
+msgid "_Close"
+msgstr "_Fenster schließen"
+
 #: src/gpafileencryptop.c:359
 msgid "The following key has been revoked by it's owner:"
 msgstr "Der folgende Schlüssel wurde vom Besitzer zurückgezogen:"
@@ -455,12 +483,13 @@
 #: src/gpafileverifyop.c:169
 #, c-format
 msgid ""
-"GPA found a file that could be a signature of %s. Would you like to verify it "
-"instead?\n"
+"GPA found a file that could be a signature of %s. Would you like to verify "
+"it instead?\n"
 "\n"
 "The file found is: %s"
 msgstr ""
-"GPA hat eine Datei gefunden, welche eine Signatur von %s sein kann.  Möchten Sie stattdessen diese überprüfen?\n"
+"GPA hat eine Datei gefunden, welche eine Signatur von %s sein kann.  Möchten "
+"Sie stattdessen diese überprüfen?\n"
 "\n"
 "Die gefundene Datei ist: %s"
 
@@ -658,14 +687,6 @@
 msgid "_Apply"
 msgstr "_Anwenden"
 
-#: src/gpawizard.c:279 src/helpmenu.c:414
-msgid "_Close"
-msgstr "_Fenster schließen"
-
-#: src/gpawizard.c:287
-msgid "_Cancel"
-msgstr "_Abbrechen"
-
 #: src/gpgmetools.c:51
 #, c-format
 msgid ""
@@ -1682,52 +1703,52 @@
 msgid "Choose new passphrase"
 msgstr "_Neuen Passwortsatz eingeben"
 
-#: src/server_access.c:268
+#: src/server_access.c:284
 msgid "No error"
 msgstr "Kein Fehler"
 
 # gpapa.c: Keyserver-Fehlermeldungen
-#: src/server_access.c:271
+#: src/server_access.c:287
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: src/server_access.c:274
+#: src/server_access.c:290
 msgid "Operation not supported"
 msgstr "Diese Operation wird nicht unterstützt"
 
-#: src/server_access.c:277
+#: src/server_access.c:293
 msgid "Version mismatch"
 msgstr "Versionen passen nicht zusammen."
 
-#: src/server_access.c:280
+#: src/server_access.c:296
 msgid "Internal keyserver error"
 msgstr "Interner Fehler des Schlüssel-Servers"
 
-#: src/server_access.c:283
+#: src/server_access.c:299
 msgid "Out of memory"
 msgstr "Nicht genügend Speicherplatz."
 
-#: src/server_access.c:286
+#: src/server_access.c:302
 msgid "Key not found"
 msgstr "Der Schlüssel wurde nicht gefunden."
 
-#: src/server_access.c:289
+#: src/server_access.c:305
 msgid "Key already exists on server"
 msgstr "Der Schlüssel liegt auf dem Server bereits vor."
 
-#: src/server_access.c:292
+#: src/server_access.c:308
 msgid "Key incomplete"
 msgstr "Unvollständiger Schlüssel"
 
-#: src/server_access.c:295
+#: src/server_access.c:311
 msgid "Could not contact keyserver"
 msgstr "Keinve Verbindung zum Schlüssel-Server möglich."
 
-#: src/server_access.c:298
+#: src/server_access.c:314
 msgid "Unknown Error"
 msgstr "Unbekannter Fehler"
 
-#: src/server_access.c:334
+#: src/server_access.c:350
 #, c-format
 msgid ""
 "Connecting to server \"%s\".\n"
@@ -1736,7 +1757,7 @@
 "Verbindung zu Server \"%s\" wird aufgebaut.\n"
 "Bitte warten."
 
-#: src/server_access.c:357 src/server_access.c:377
+#: src/server_access.c:373 src/server_access.c:393
 #, c-format
 msgid ""
 "An error ocurred while contacting the server:\n"
@@ -1747,7 +1768,7 @@
 "\n"
 "%s"
 
-#: src/server_access.c:441
+#: src/server_access.c:457
 msgid ""
 "There is no plugin available for the keyserver\n"
 "protocol you specified."
@@ -1755,7 +1776,7 @@
 "Für das eingestellte Schlüssel-Server-Protokoll\n"
 "ist kein Plugin verfügbar."
 
-#: src/server_access.c:513 src/server_access.c:558
+#: src/server_access.c:530 src/server_access.c:576
 msgid "The keyserver you specified is not valid"
 msgstr "Der angegebene Schlüssel-Server ist nicht gültig."
 
@@ -1771,14 +1792,6 @@
 msgid "Use _advanced mode:"
 msgstr "Einstellungen für Fortgeschrittene verwenden:"
 
-#: src/settingsdlg.c:136
-msgid "_Yes"
-msgstr "_Ja"
-
-#: src/settingsdlg.c:139
-msgid "_No"
-msgstr "_Nein"
-
 #: src/settingsdlg.c:163
 msgid "Settings"
 msgstr "Einstellungen"

Modified: trunk/po/es.po
===================================================================
--- trunk/po/es.po	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/po/es.po	2006-01-17 10:56:54 UTC (rev 738)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-11 10:08+0100\n"
+"POT-Creation-Date: 2006-01-17 10:18+0100\n"
 "PO-Revision-Date: 2003-10-18 13:35+0200\n"
 "Last-Translator: Miguel Coca <mcoca at gnu.org>\n"
 "Language-Team: Spanish <es at li.org>\n"
@@ -15,6 +15,13 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
+#: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
+#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/ownertrustdlg.c:110 src/passwddlg.c:98
+msgid "_Cancel"
+msgstr "_Cancelar"
+
 #: src/encryptdlg.c:135
 msgid "Encrypt files"
 msgstr "Cifrar archivos"
@@ -272,6 +279,20 @@
 "El archivo %s ya existe.\n"
 "¿Quiere sobreescribirlo?"
 
+#: src/gpabackupop.c:218 src/gpaexportserverop.c:132
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
+#: src/settingsdlg.c:136
+msgid "_Yes"
+msgstr "_Sí"
+
+#: src/gpabackupop.c:219 src/gpaexportserverop.c:133
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
+#: src/settingsdlg.c:139
+msgid "_No"
+msgstr "_No"
+
 #: src/gpabackupop.c:231
 #, c-format
 msgid ""
@@ -427,6 +448,13 @@
 msgid "Revoked Key"
 msgstr "Clave Revocada"
 
+#: src/gpafileencryptop.c:346 src/gpafileencryptop.c:386 src/gpawizard.c:279
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/keyeditdlg.c:150 src/keylist.c:499 src/settingsdlg.c:166
+#: src/verifydlg.c:117
+msgid "_Close"
+msgstr "_Cerrar"
+
 #: src/gpafileencryptop.c:359
 msgid "The following key has been revoked by it's owner:"
 msgstr "Esta clave ha sido revocada por su propietario:"
@@ -455,8 +483,8 @@
 #: src/gpafileverifyop.c:169
 #, c-format
 msgid ""
-"GPA found a file that could be a signature of %s.Would you like to verify it "
-"instead?\n"
+"GPA found a file that could be a signature of %s. Would you like to verify "
+"it instead?\n"
 "\n"
 "The file found is: %s"
 msgstr ""
@@ -657,14 +685,6 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpawizard.c:279 src/helpmenu.c:414
-msgid "_Close"
-msgstr "_Cerrar"
-
-#: src/gpawizard.c:287
-msgid "_Cancel"
-msgstr "_Cancelar"
-
 #: src/gpgmetools.c:51
 #, c-format
 msgid ""
@@ -1665,51 +1685,51 @@
 msgid "Choose new passphrase"
 msgstr "Elegir nueva contraseña"
 
-#: src/server_access.c:268
+#: src/server_access.c:284
 msgid "No error"
 msgstr "No hay error"
 
-#: src/server_access.c:271
+#: src/server_access.c:287
 msgid "Internal error"
 msgstr "Error interno"
 
-#: src/server_access.c:274
+#: src/server_access.c:290
 msgid "Operation not supported"
 msgstr "Operación no soportada"
 
-#: src/server_access.c:277
+#: src/server_access.c:293
 msgid "Version mismatch"
 msgstr "Error de versión"
 
-#: src/server_access.c:280
+#: src/server_access.c:296
 msgid "Internal keyserver error"
 msgstr "Error interno del servidor de claves"
 
-#: src/server_access.c:283
+#: src/server_access.c:299
 msgid "Out of memory"
 msgstr "Falta memoria"
 
-#: src/server_access.c:286
+#: src/server_access.c:302
 msgid "Key not found"
 msgstr "Clave no encontrada"
 
-#: src/server_access.c:289
+#: src/server_access.c:305
 msgid "Key already exists on server"
 msgstr "La clave ya está en el servidor"
 
-#: src/server_access.c:292
+#: src/server_access.c:308
 msgid "Key incomplete"
 msgstr "Clave incompleta"
 
-#: src/server_access.c:295
+#: src/server_access.c:311
 msgid "Could not contact keyserver"
 msgstr "No se pudo contactar con el servidor"
 
-#: src/server_access.c:298
+#: src/server_access.c:314
 msgid "Unknown Error"
 msgstr "Error Desconocido"
 
-#: src/server_access.c:334
+#: src/server_access.c:350
 #, c-format
 msgid ""
 "Connecting to server \"%s\".\n"
@@ -1718,7 +1738,7 @@
 "Conectando con el servidor \"%s\".\n"
 "Espere, por favor."
 
-#: src/server_access.c:357 src/server_access.c:377
+#: src/server_access.c:373 src/server_access.c:393
 #, c-format
 msgid ""
 "An error ocurred while contacting the server:\n"
@@ -1729,7 +1749,7 @@
 "\n"
 "%s"
 
-#: src/server_access.c:441
+#: src/server_access.c:457
 msgid ""
 "There is no plugin available for the keyserver\n"
 "protocol you specified."
@@ -1737,7 +1757,7 @@
 "No hay plugin disponible para el protocolo de servidor\n"
 "de claves que especificó."
 
-#: src/server_access.c:513 src/server_access.c:558
+#: src/server_access.c:530 src/server_access.c:576
 msgid "The keyserver you specified is not valid"
 msgstr "El servidor de claves que especificó no es válido"
 
@@ -1753,14 +1773,6 @@
 msgid "Use _advanced mode:"
 msgstr "Usar modo _avanzado:"
 
-#: src/settingsdlg.c:136
-msgid "_Yes"
-msgstr "_Sí"
-
-#: src/settingsdlg.c:139
-msgid "_No"
-msgstr "_No"
-
 #: src/settingsdlg.c:163
 msgid "Settings"
 msgstr "Preferencias"

Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/po/fr.po	2006-01-17 10:56:54 UTC (rev 738)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-11 10:08+0100\n"
+"POT-Creation-Date: 2006-01-17 10:18+0100\n"
 "PO-Revision-Date: 2003-01-01 21:11+0100\n"
 "Last-Translator: \n"
 "Language-Team:  <fr at li.org>\n"
@@ -15,6 +15,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
+#: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
+#: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
+#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/ownertrustdlg.c:110 src/passwddlg.c:98
+msgid "_Cancel"
+msgstr "_Annuler"
+
 #: src/encryptdlg.c:135
 msgid "Encrypt files"
 msgstr "Chiffrer fichiers"
@@ -287,6 +294,21 @@
 "Le fichier %s existe déjà.\n"
 "Voulez-vous l'écraser?"
 
+#: src/gpabackupop.c:218 src/gpaexportserverop.c:132
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
+#: src/settingsdlg.c:136
+#, fuzzy
+msgid "_Yes"
+msgstr "/_Clefs"
+
+#: src/gpabackupop.c:219 src/gpaexportserverop.c:133
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
+#: src/settingsdlg.c:139
+msgid "_No"
+msgstr "_Non"
+
 #: src/gpabackupop.c:231
 #, c-format
 msgid ""
@@ -453,6 +475,13 @@
 msgid "Revoked Key"
 msgstr "Clef révoquée"
 
+#: src/gpafileencryptop.c:346 src/gpafileencryptop.c:386 src/gpawizard.c:279
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/keyeditdlg.c:150 src/keylist.c:499 src/settingsdlg.c:166
+#: src/verifydlg.c:117
+msgid "_Close"
+msgstr "_Fermer"
+
 #: src/gpafileencryptop.c:359
 msgid "The following key has been revoked by it's owner:"
 msgstr "La clef suivante a été révoquée par son propriétaire"
@@ -485,8 +514,8 @@
 #: src/gpafileverifyop.c:169
 #, c-format
 msgid ""
-"GPA found a file that could be a signature of %s.Would you like to verify it "
-"instead?\n"
+"GPA found a file that could be a signature of %s. Would you like to verify "
+"it instead?\n"
 "\n"
 "The file found is: %s"
 msgstr ""
@@ -700,14 +729,6 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpawizard.c:279 src/helpmenu.c:414
-msgid "_Close"
-msgstr "_Fermer"
-
-#: src/gpawizard.c:287
-msgid "_Cancel"
-msgstr "_Annuler"
-
 #: src/gpgmetools.c:51
 #, c-format
 msgid ""
@@ -1773,54 +1794,54 @@
 msgid "Choose new passphrase"
 msgstr "_Entrer le nouveau mot de passe"
 
-#: src/server_access.c:268
+#: src/server_access.c:284
 msgid "No error"
 msgstr "Aucune erreur"
 
-#: src/server_access.c:271
+#: src/server_access.c:287
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: src/server_access.c:274
+#: src/server_access.c:290
 msgid "Operation not supported"
 msgstr "Opération non supportée"
 
-#: src/server_access.c:277
+#: src/server_access.c:293
 msgid "Version mismatch"
 msgstr "Version ne correspondant pas"
 
-#: src/server_access.c:280
+#: src/server_access.c:296
 msgid "Internal keyserver error"
 msgstr "Erreur interne au serveur de clefs"
 
-#: src/server_access.c:283
+#: src/server_access.c:299
 msgid "Out of memory"
 msgstr "A cours de mémoire"
 
-#: src/server_access.c:286
+#: src/server_access.c:302
 msgid "Key not found"
 msgstr "Clef introuvable"
 
-#: src/server_access.c:289
+#: src/server_access.c:305
 #, fuzzy
 msgid "Key already exists on server"
 msgstr "Clefs envoyées au serveur."
 
-#: src/server_access.c:292
+#: src/server_access.c:308
 msgid "Key incomplete"
 msgstr "Clef incomplète"
 
-#: src/server_access.c:295
+#: src/server_access.c:311
 #, fuzzy
 msgid "Could not contact keyserver"
 msgstr "_envoyer au serveur de clefs"
 
-#: src/server_access.c:298
+#: src/server_access.c:314
 #, fuzzy
 msgid "Unknown Error"
 msgstr "[ID d'utilisateur inconnue]"
 
-#: src/server_access.c:334
+#: src/server_access.c:350
 #, c-format
 msgid ""
 "Connecting to server \"%s\".\n"
@@ -1829,7 +1850,7 @@
 "Connection au serveur \"%s\".\n"
 "Veuillez patienter."
 
-#: src/server_access.c:357 src/server_access.c:377
+#: src/server_access.c:373 src/server_access.c:393
 #, fuzzy, c-format
 msgid ""
 "An error ocurred while contacting the server:\n"
@@ -1839,7 +1860,7 @@
 "Une erreur est survenue lors\n"
 "de l'exportation des clefs secrètes."
 
-#: src/server_access.c:441
+#: src/server_access.c:457
 msgid ""
 "There is no plugin available for the keyserver\n"
 "protocol you specified."
@@ -1847,7 +1868,7 @@
 "Il n'y a aucun plugin disponible pour le protocole de\n"
 "serveur de clefs que vous avez spécifié."
 
-#: src/server_access.c:513 src/server_access.c:558
+#: src/server_access.c:530 src/server_access.c:576
 msgid "The keyserver you specified is not valid"
 msgstr "Le serveur de clefs que vous avez indiqué n'est pas valide"
 
@@ -1864,15 +1885,6 @@
 msgid "Use _advanced mode:"
 msgstr "Utiliser _le mode avancé:"
 
-#: src/settingsdlg.c:136
-#, fuzzy
-msgid "_Yes"
-msgstr "/_Clefs"
-
-#: src/settingsdlg.c:139
-msgid "_No"
-msgstr "_Non"
-
 #: src/settingsdlg.c:163
 msgid "Settings"
 msgstr "Réglages"

Modified: trunk/po/ja.po
===================================================================
--- trunk/po/ja.po	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/po/ja.po	2006-01-17 10:56:54 UTC (rev 738)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.6.1-cvs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-11 10:08+0100\n"
+"POT-Creation-Date: 2006-01-17 10:18+0100\n"
 "PO-Revision-Date: 2003-11-03 17:11+0100\n"
 "Last-Translator: TAKAHASHI Tamotsu <ttakah at lapis.plala.or.jp>\n"
 "Language-Team: Japanese <gnupg-i18n at gnupg.org>\n"
@@ -15,6 +15,13 @@
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
+#: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
+#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/ownertrustdlg.c:110 src/passwddlg.c:98
+msgid "_Cancel"
+msgstr "¥­¥ã¥ó¥»¥ë (_C)"
+
 #: src/encryptdlg.c:135
 msgid "Encrypt files"
 msgstr "¥Õ¥¡¥¤¥ë°Å¹æ²½"
@@ -272,6 +279,20 @@
 "Ʊ¤¸¥Õ¥¡¥¤¥ë %s ¤¬¤¢¤ê¤Þ¤¹\n"
 "¾å½ñ¤­¤·¤Þ¤¹¤«?"
 
+#: src/gpabackupop.c:218 src/gpaexportserverop.c:132
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
+#: src/settingsdlg.c:136
+msgid "_Yes"
+msgstr "¤Ï¤¤ (_Y)"
+
+#: src/gpabackupop.c:219 src/gpaexportserverop.c:133
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
+#: src/settingsdlg.c:139
+msgid "_No"
+msgstr "¤¤¤¤¤¨ (_N)"
+
 #: src/gpabackupop.c:231
 #, c-format
 msgid ""
@@ -426,6 +447,13 @@
 msgid "Revoked Key"
 msgstr "ÇË´þºÑ¤ß¤Î¸°"
 
+#: src/gpafileencryptop.c:346 src/gpafileencryptop.c:386 src/gpawizard.c:279
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/keyeditdlg.c:150 src/keylist.c:499 src/settingsdlg.c:166
+#: src/verifydlg.c:117
+msgid "_Close"
+msgstr "ÊĤ¸¤ë (_C)"
+
 #: src/gpafileencryptop.c:359
 msgid "The following key has been revoked by it's owner:"
 msgstr "°Ê²¼¤Î¸°¤Ï½êÍ­¼Ô¤Ë¤è¤Ã¤ÆÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹:"
@@ -454,8 +482,8 @@
 #: src/gpafileverifyop.c:169
 #, c-format
 msgid ""
-"GPA found a file that could be a signature of %s.Would you like to verify it "
-"instead?\n"
+"GPA found a file that could be a signature of %s. Would you like to verify "
+"it instead?\n"
 "\n"
 "The file found is: %s"
 msgstr ""
@@ -655,14 +683,6 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpawizard.c:279 src/helpmenu.c:414
-msgid "_Close"
-msgstr "ÊĤ¸¤ë (_C)"
-
-#: src/gpawizard.c:287
-msgid "_Cancel"
-msgstr "¥­¥ã¥ó¥»¥ë (_C)"
-
 #: src/gpgmetools.c:51
 #, c-format
 msgid ""
@@ -1647,51 +1667,51 @@
 msgid "Choose new passphrase"
 msgstr "¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÁªÂò"
 
-#: src/server_access.c:268
+#: src/server_access.c:284
 msgid "No error"
 msgstr "¥¨¥é¡¼¤Ê¤·"
 
-#: src/server_access.c:271
+#: src/server_access.c:287
 msgid "Internal error"
 msgstr "ÆâÉô¥¨¥é¡¼"
 
-#: src/server_access.c:274
+#: src/server_access.c:290
 msgid "Operation not supported"
 msgstr "Áàºî¤¬¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/server_access.c:277
+#: src/server_access.c:293
 msgid "Version mismatch"
 msgstr "¥Ð¡¼¥¸¥ç¥ó¤¬¹ç¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/server_access.c:280
+#: src/server_access.c:296
 msgid "Internal keyserver error"
 msgstr "¸°¥µ¡¼¥Ð´ØÏ¢¤ÎÆâÉô¥¨¥é¡¼"
 
-#: src/server_access.c:283
+#: src/server_access.c:299
 msgid "Out of memory"
 msgstr "¥á¥â¥êÉÔ­"
 
-#: src/server_access.c:286
+#: src/server_access.c:302
 msgid "Key not found"
 msgstr "¸°¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó"
 
-#: src/server_access.c:289
+#: src/server_access.c:305
 msgid "Key already exists on server"
 msgstr "¥µ¡¼¥Ð¤Ë´û¤Ë¸°¤¬Â¸ºß¤·¤Þ¤¹"
 
-#: src/server_access.c:292
+#: src/server_access.c:308
 msgid "Key incomplete"
 msgstr "¸°¤¬ÉÔ´°Á´¤Ç¤¹"
 
-#: src/server_access.c:295
+#: src/server_access.c:311
 msgid "Could not contact keyserver"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤ÈÏ¢Íí¤¬¤È¤ì¤Þ¤»¤ó"
 
-#: src/server_access.c:298
+#: src/server_access.c:314
 msgid "Unknown Error"
 msgstr "̤³Îǧ¥¨¥é¡¼"
 
-#: src/server_access.c:334
+#: src/server_access.c:350
 #, c-format
 msgid ""
 "Connecting to server \"%s\".\n"
@@ -1700,7 +1720,7 @@
 "¥µ¡¼¥Ð \"%s\" ¤ËÀܳÃæ¤Ç¤¹¡£\n"
 "¤ªÂÔ¤Á¤¯¤À¤µ¤¤¡£"
 
-#: src/server_access.c:357 src/server_access.c:377
+#: src/server_access.c:373 src/server_access.c:393
 #, c-format
 msgid ""
 "An error ocurred while contacting the server:\n"
@@ -1711,7 +1731,7 @@
 "\n"
 "%s"
 
-#: src/server_access.c:441
+#: src/server_access.c:457
 msgid ""
 "There is no plugin available for the keyserver\n"
 "protocol you specified."
@@ -1719,7 +1739,7 @@
 "»ØÄꤵ¤ì¤¿¥×¥í¥È¥³¥ë¤Î¸°¥µ¡¼¥Ð¤Ë\n"
 "»È¤¨¤ë¥×¥é¥°¥¤¥ó¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: src/server_access.c:513 src/server_access.c:558
+#: src/server_access.c:530 src/server_access.c:576
 msgid "The keyserver you specified is not valid"
 msgstr "»ØÄꤵ¤ì¤¿¸°¥µ¡¼¥Ð¤Ï̵¸ú¤Ç¤¹"
 
@@ -1735,14 +1755,6 @@
 msgid "Use _advanced mode:"
 msgstr "¾åµé¼Ô¥â¡¼¥É¤ò»È¤¦ (_A):"
 
-#: src/settingsdlg.c:136
-msgid "_Yes"
-msgstr "¤Ï¤¤ (_Y)"
-
-#: src/settingsdlg.c:139
-msgid "_No"
-msgstr "¤¤¤¤¤¨ (_N)"
-
 #: src/settingsdlg.c:163
 msgid "Settings"
 msgstr "ÀßÄê"

Modified: trunk/po/nl.po
===================================================================
--- trunk/po/nl.po	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/po/nl.po	2006-01-17 10:56:54 UTC (rev 738)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-11 10:08+0100\n"
+"POT-Creation-Date: 2006-01-17 10:18+0100\n"
 "PO-Revision-Date: 2003-10-19 14:29+0200\n"
 "Last-Translator: Michael Anckaert <michael.anckaert at pi.be>\n"
 "Language-Team: DUTCH <nl at li.org>\n"
@@ -12,6 +12,13 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
+#: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
+#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/ownertrustdlg.c:110 src/passwddlg.c:98
+msgid "_Cancel"
+msgstr "_Annuleer"
+
 #: src/encryptdlg.c:135
 msgid "Encrypt files"
 msgstr "Versleutel bestanden"
@@ -269,6 +276,20 @@
 "Het bestand %s bestaat al.\n"
 "Wilt u het bestand overschrijven?"
 
+#: src/gpabackupop.c:218 src/gpaexportserverop.c:132
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
+#: src/settingsdlg.c:136
+msgid "_Yes"
+msgstr "_Ja"
+
+#: src/gpabackupop.c:219 src/gpaexportserverop.c:133
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
+#: src/settingsdlg.c:139
+msgid "_No"
+msgstr "_Nee"
+
 #: src/gpabackupop.c:231
 #, c-format
 msgid ""
@@ -423,6 +444,13 @@
 msgid "Revoked Key"
 msgstr "Teruggetrokken sleutel"
 
+#: src/gpafileencryptop.c:346 src/gpafileencryptop.c:386 src/gpawizard.c:279
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/keyeditdlg.c:150 src/keylist.c:499 src/settingsdlg.c:166
+#: src/verifydlg.c:117
+msgid "_Close"
+msgstr "_Sluiten"
+
 #: src/gpafileencryptop.c:359
 msgid "The following key has been revoked by it's owner:"
 msgstr "De volgende sleutel is gerevoceerd door de eigenaar:"
@@ -451,8 +479,8 @@
 #: src/gpafileverifyop.c:169
 #, c-format
 msgid ""
-"GPA found a file that could be a signature of %s.Would you like to verify it "
-"instead?\n"
+"GPA found a file that could be a signature of %s. Would you like to verify "
+"it instead?\n"
 "\n"
 "The file found is: %s"
 msgstr ""
@@ -654,14 +682,6 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpawizard.c:279 src/helpmenu.c:414
-msgid "_Close"
-msgstr "_Sluiten"
-
-#: src/gpawizard.c:287
-msgid "_Cancel"
-msgstr "_Annuleer"
-
 #: src/gpgmetools.c:51
 #, c-format
 msgid ""
@@ -1661,52 +1681,52 @@
 msgid "Choose new passphrase"
 msgstr "_Geef een nieuw wachtwoord in"
 
-#: src/server_access.c:268
+#: src/server_access.c:284
 msgid "No error"
 msgstr "Geen fout"
 
 # gpapa.c: Keyserver-Fehlermeldungen
-#: src/server_access.c:271
+#: src/server_access.c:287
 msgid "Internal error"
 msgstr "Inwendige fout"
 
-#: src/server_access.c:274
+#: src/server_access.c:290
 msgid "Operation not supported"
 msgstr "Actie niet ondersteund"
 
-#: src/server_access.c:277
+#: src/server_access.c:293
 msgid "Version mismatch"
 msgstr "Niet passende versie"
 
-#: src/server_access.c:280
+#: src/server_access.c:296
 msgid "Internal keyserver error"
 msgstr "Inwendige keyserver fout"
 
-#: src/server_access.c:283
+#: src/server_access.c:299
 msgid "Out of memory"
 msgstr "Geen geheugen meer"
 
-#: src/server_access.c:286
+#: src/server_access.c:302
 msgid "Key not found"
 msgstr "Sleutel niet gevonden"
 
-#: src/server_access.c:289
+#: src/server_access.c:305
 msgid "Key already exists on server"
 msgstr "Sleutel bestaat al op de server"
 
-#: src/server_access.c:292
+#: src/server_access.c:308
 msgid "Key incomplete"
 msgstr "Sleutel niet compleet"
 
-#: src/server_access.c:295
+#: src/server_access.c:311
 msgid "Could not contact keyserver"
 msgstr "Kan de keyserver niet contacteren"
 
-#: src/server_access.c:298
+#: src/server_access.c:314
 msgid "Unknown Error"
 msgstr "Onbekende fout"
 
-#: src/server_access.c:334
+#: src/server_access.c:350
 #, c-format
 msgid ""
 "Connecting to server \"%s\".\n"
@@ -1715,7 +1735,7 @@
 "Verbinden met server \"%s\".\n"
 "Even geduld."
 
-#: src/server_access.c:357 src/server_access.c:377
+#: src/server_access.c:373 src/server_access.c:393
 #, c-format
 msgid ""
 "An error ocurred while contacting the server:\n"
@@ -1726,7 +1746,7 @@
 "\n"
 "%s werd gecontacteerd."
 
-#: src/server_access.c:441
+#: src/server_access.c:457
 msgid ""
 "There is no plugin available for the keyserver\n"
 "protocol you specified."
@@ -1734,7 +1754,7 @@
 "Er is geen plugin beschikbaar voor het keyserver\n"
 "protocol dat u specifieerde."
 
-#: src/server_access.c:513 src/server_access.c:558
+#: src/server_access.c:530 src/server_access.c:576
 msgid "The keyserver you specified is not valid"
 msgstr "De keyserver die u specifieerde is niet geldig"
 
@@ -1750,14 +1770,6 @@
 msgid "Use _advanced mode:"
 msgstr "Gebruik ge_avanceerde mode:"
 
-#: src/settingsdlg.c:136
-msgid "_Yes"
-msgstr "_Ja"
-
-#: src/settingsdlg.c:139
-msgid "_No"
-msgstr "_Nee"
-
 #: src/settingsdlg.c:163
 msgid "Settings"
 msgstr "Instellingen"

Modified: trunk/po/pl.po
===================================================================
--- trunk/po/pl.po	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/po/pl.po	2006-01-17 10:56:54 UTC (rev 738)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gpa-0.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-11 10:08+0100\n"
+"POT-Creation-Date: 2006-01-17 10:18+0100\n"
 "PO-Revision-Date: 2004-08-22 02:23+0200\n"
 "Last-Translator: Emilian Nowak <emil5 at go2.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
@@ -15,6 +15,13 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
+#: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
+#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/ownertrustdlg.c:110 src/passwddlg.c:98
+msgid "_Cancel"
+msgstr ""
+
 #: src/encryptdlg.c:135
 msgid "Encrypt files"
 msgstr "Zaszyfruj pliki"
@@ -272,6 +279,20 @@
 "Plik %s już istnieje.\n"
 "Czy chcesz go nadpisać?"
 
+#: src/gpabackupop.c:218 src/gpaexportserverop.c:132
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
+#: src/settingsdlg.c:136
+msgid "_Yes"
+msgstr "_Tak"
+
+#: src/gpabackupop.c:219 src/gpaexportserverop.c:133
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
+#: src/settingsdlg.c:139
+msgid "_No"
+msgstr "_Nie"
+
 #: src/gpabackupop.c:231
 #, c-format
 msgid ""
@@ -427,6 +448,13 @@
 msgid "Revoked Key"
 msgstr "Unieważniony klucz"
 
+#: src/gpafileencryptop.c:346 src/gpafileencryptop.c:386 src/gpawizard.c:279
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/keyeditdlg.c:150 src/keylist.c:499 src/settingsdlg.c:166
+#: src/verifydlg.c:117
+msgid "_Close"
+msgstr "Z_amknij"
+
 #: src/gpafileencryptop.c:359
 msgid "The following key has been revoked by it's owner:"
 msgstr "Ten klucz został unieważniony przez swojego właściciela:"
@@ -453,10 +481,10 @@
 msgstr "Weryfikacja..."
 
 #: src/gpafileverifyop.c:169
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"GPA found a file that could be a signature of %s.Would you like to verify it "
-"instead?\n"
+"GPA found a file that could be a signature of %s. Would you like to verify "
+"it instead?\n"
 "\n"
 "The file found is: %s"
 msgstr ""
@@ -660,14 +688,6 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpawizard.c:279 src/helpmenu.c:414
-msgid "_Close"
-msgstr "Z_amknij"
-
-#: src/gpawizard.c:287
-msgid "_Cancel"
-msgstr ""
-
 #: src/gpgmetools.c:51
 #, c-format
 msgid ""
@@ -1677,51 +1697,51 @@
 msgid "Choose new passphrase"
 msgstr "Wprowadź nowe hasło"
 
-#: src/server_access.c:268
+#: src/server_access.c:284
 msgid "No error"
 msgstr "Brak błędów"
 
-#: src/server_access.c:271
+#: src/server_access.c:287
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
-#: src/server_access.c:274
+#: src/server_access.c:290
 msgid "Operation not supported"
 msgstr "Operacja nie jest obsługiwana"
 
-#: src/server_access.c:277
+#: src/server_access.c:293
 msgid "Version mismatch"
 msgstr "Niezgodność wersji"
 
-#: src/server_access.c:280
+#: src/server_access.c:296
 msgid "Internal keyserver error"
 msgstr "Wewnętrzny błąd serwera kluczy"
 
-#: src/server_access.c:283
+#: src/server_access.c:299
 msgid "Out of memory"
 msgstr "Brak pamięci"
 
-#: src/server_access.c:286
+#: src/server_access.c:302
 msgid "Key not found"
 msgstr "Klucz nie został znaleziony"
 
-#: src/server_access.c:289
+#: src/server_access.c:305
 msgid "Key already exists on server"
 msgstr "Klucz już istnieje na serwerze"
 
-#: src/server_access.c:292
+#: src/server_access.c:308
 msgid "Key incomplete"
 msgstr "Klucz nie jest pełny"
 
-#: src/server_access.c:295
+#: src/server_access.c:311
 msgid "Could not contact keyserver"
 msgstr "Nie można nawiązać połączenia z serwerem kluczy"
 
-#: src/server_access.c:298
+#: src/server_access.c:314
 msgid "Unknown Error"
 msgstr "Nieznany błąd"
 
-#: src/server_access.c:334
+#: src/server_access.c:350
 #, c-format
 msgid ""
 "Connecting to server \"%s\".\n"
@@ -1730,7 +1750,7 @@
 "Łączenie z serwerem \"%s\".\n"
 "Proszę czekać."
 
-#: src/server_access.c:357 src/server_access.c:377
+#: src/server_access.c:373 src/server_access.c:393
 #, c-format
 msgid ""
 "An error ocurred while contacting the server:\n"
@@ -1741,7 +1761,7 @@
 "\n"
 "%s"
 
-#: src/server_access.c:441
+#: src/server_access.c:457
 msgid ""
 "There is no plugin available for the keyserver\n"
 "protocol you specified."
@@ -1749,7 +1769,7 @@
 "Nie ma dostępnej wtyczki dla wybranego protokołu\n"
 "obsługującego serwer kluczy."
 
-#: src/server_access.c:513 src/server_access.c:558
+#: src/server_access.c:530 src/server_access.c:576
 msgid "The keyserver you specified is not valid"
 msgstr "Podany serwer kluczy nie jest poprawny."
 
@@ -1765,14 +1785,6 @@
 msgid "Use _advanced mode:"
 msgstr "Użyj trybu zaawansowanego:"
 
-#: src/settingsdlg.c:136
-msgid "_Yes"
-msgstr "_Tak"
-
-#: src/settingsdlg.c:139
-msgid "_No"
-msgstr "_Nie"
-
 #: src/settingsdlg.c:163
 msgid "Settings"
 msgstr "Ustawienia"

Modified: trunk/po/pt_BR.po
===================================================================
--- trunk/po/pt_BR.po	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/po/pt_BR.po	2006-01-17 10:56:54 UTC (rev 738)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-11 10:08+0100\n"
+"POT-Creation-Date: 2006-01-17 10:18+0100\n"
 "PO-Revision-Date: 2003-01-20 18:39+0100\n"
 "Last-Translator: Renato Martini <rmartini at cipsga.org.br>\n"
 "Language-Team: PORTUGUES <rmartini at cipsga.org.br>\n"
@@ -14,6 +14,13 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
+#: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
+#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/ownertrustdlg.c:110 src/passwddlg.c:98
+msgid "_Cancel"
+msgstr "_Cancelar"
+
 #: src/encryptdlg.c:135
 msgid "Encrypt files"
 msgstr "Encriptar arquivos"
@@ -278,6 +285,20 @@
 "O arquivo %s já existe.\n"
 "Você quer sobrescrevê-lo?"
 
+#: src/gpabackupop.c:218 src/gpaexportserverop.c:132
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
+#: src/settingsdlg.c:136
+msgid "_Yes"
+msgstr "_Sim"
+
+#: src/gpabackupop.c:219 src/gpaexportserverop.c:133
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
+#: src/settingsdlg.c:139
+msgid "_No"
+msgstr "_Não"
+
 #: src/gpabackupop.c:231
 #, c-format
 msgid ""
@@ -433,6 +454,13 @@
 msgid "Revoked Key"
 msgstr "Chave revogada"
 
+#: src/gpafileencryptop.c:346 src/gpafileencryptop.c:386 src/gpawizard.c:279
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/keyeditdlg.c:150 src/keylist.c:499 src/settingsdlg.c:166
+#: src/verifydlg.c:117
+msgid "_Close"
+msgstr "_Fechar"
+
 #: src/gpafileencryptop.c:359
 msgid "The following key has been revoked by it's owner:"
 msgstr "A seguinte chave foi revogada pelo seu proprietário:"
@@ -463,8 +491,8 @@
 #: src/gpafileverifyop.c:169
 #, c-format
 msgid ""
-"GPA found a file that could be a signature of %s.Would you like to verify it "
-"instead?\n"
+"GPA found a file that could be a signature of %s. Would you like to verify "
+"it instead?\n"
 "\n"
 "The file found is: %s"
 msgstr ""
@@ -670,14 +698,6 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpawizard.c:279 src/helpmenu.c:414
-msgid "_Close"
-msgstr "_Fechar"
-
-#: src/gpawizard.c:287
-msgid "_Cancel"
-msgstr "_Cancelar"
-
 #: src/gpgmetools.c:51
 #, c-format
 msgid ""
@@ -1682,51 +1702,51 @@
 msgid "Choose new passphrase"
 msgstr "_Entre com uma nova senha"
 
-#: src/server_access.c:268
+#: src/server_access.c:284
 msgid "No error"
 msgstr "Nenhum erro"
 
-#: src/server_access.c:271
+#: src/server_access.c:287
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: src/server_access.c:274
+#: src/server_access.c:290
 msgid "Operation not supported"
 msgstr "Operação não suportada"
 
-#: src/server_access.c:277
+#: src/server_access.c:293
 msgid "Version mismatch"
 msgstr "Versão incorreta"
 
-#: src/server_access.c:280
+#: src/server_access.c:296
 msgid "Internal keyserver error"
 msgstr "Erro interno do servidor"
 
-#: src/server_access.c:283
+#: src/server_access.c:299
 msgid "Out of memory"
 msgstr "Sem memória"
 
-#: src/server_access.c:286
+#: src/server_access.c:302
 msgid "Key not found"
 msgstr "Chave não encontrada"
 
-#: src/server_access.c:289
+#: src/server_access.c:305
 msgid "Key already exists on server"
 msgstr "Chave já existe no servidor"
 
-#: src/server_access.c:292
+#: src/server_access.c:308
 msgid "Key incomplete"
 msgstr "Chave incompleta"
 
-#: src/server_access.c:295
+#: src/server_access.c:311
 msgid "Could not contact keyserver"
 msgstr "Não foi possível contactar o servidor"
 
-#: src/server_access.c:298
+#: src/server_access.c:314
 msgid "Unknown Error"
 msgstr "ERRO desconhecido"
 
-#: src/server_access.c:334
+#: src/server_access.c:350
 #, c-format
 msgid ""
 "Connecting to server \"%s\".\n"
@@ -1735,7 +1755,7 @@
 "Conectando com o servidor \"%s\".\n"
 "Por favor espere."
 
-#: src/server_access.c:357 src/server_access.c:377
+#: src/server_access.c:373 src/server_access.c:393
 #, c-format
 msgid ""
 "An error ocurred while contacting the server:\n"
@@ -1746,7 +1766,7 @@
 "\n"
 "%s"
 
-#: src/server_access.c:441
+#: src/server_access.c:457
 msgid ""
 "There is no plugin available for the keyserver\n"
 "protocol you specified."
@@ -1754,7 +1774,7 @@
 "Não há um plugin disponível para o servidor de chaves\n"
 "com o protocolo especificado."
 
-#: src/server_access.c:513 src/server_access.c:558
+#: src/server_access.c:530 src/server_access.c:576
 msgid "The keyserver you specified is not valid"
 msgstr "O servidor de chaves especificado não é válido"
 
@@ -1770,14 +1790,6 @@
 msgid "Use _advanced mode:"
 msgstr "Usar modo _avançado:"
 
-#: src/settingsdlg.c:136
-msgid "_Yes"
-msgstr "_Sim"
-
-#: src/settingsdlg.c:139
-msgid "_No"
-msgstr "_Não"
-
 #: src/settingsdlg.c:163
 msgid "Settings"
 msgstr "Configuração"

Modified: trunk/po/sv.po
===================================================================
--- trunk/po/sv.po	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/po/sv.po	2006-01-17 10:56:54 UTC (rev 738)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: GPA 0.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-11 10:08+0100\n"
+"POT-Creation-Date: 2006-01-17 10:18+0100\n"
 "PO-Revision-Date: 2003-01-29 16:34+0100\n"
 "Last-Translator: Mick Ohrberg <mick.ohrberg at umb.com>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -11,6 +11,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
+#: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
+#: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
+#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/ownertrustdlg.c:110 src/passwddlg.c:98
+msgid "_Cancel"
+msgstr "_Avbryt"
+
 #: src/encryptdlg.c:135
 msgid "Encrypt files"
 msgstr "Kryptera filer"
@@ -276,6 +283,20 @@
 "Filen %s existerar redan.\n"
 "Vill du skriva över?"
 
+#: src/gpabackupop.c:218 src/gpaexportserverop.c:132
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
+#: src/settingsdlg.c:136
+msgid "_Yes"
+msgstr "_Ja"
+
+#: src/gpabackupop.c:219 src/gpaexportserverop.c:133
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
+#: src/settingsdlg.c:139
+msgid "_No"
+msgstr "_Nej"
+
 #: src/gpabackupop.c:231
 #, c-format
 msgid ""
@@ -432,6 +453,13 @@
 msgid "Revoked Key"
 msgstr "Ogiltigförklarad nyckel"
 
+#: src/gpafileencryptop.c:346 src/gpafileencryptop.c:386 src/gpawizard.c:279
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/keyeditdlg.c:150 src/keylist.c:499 src/settingsdlg.c:166
+#: src/verifydlg.c:117
+msgid "_Close"
+msgstr "_Stäng"
+
 #: src/gpafileencryptop.c:359
 msgid "The following key has been revoked by it's owner:"
 msgstr "Följande nyckel har ogiltigförklarats av sin ägare:"
@@ -462,8 +490,8 @@
 #: src/gpafileverifyop.c:169
 #, c-format
 msgid ""
-"GPA found a file that could be a signature of %s.Would you like to verify it "
-"instead?\n"
+"GPA found a file that could be a signature of %s. Would you like to verify "
+"it instead?\n"
 "\n"
 "The file found is: %s"
 msgstr ""
@@ -668,14 +696,6 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpawizard.c:279 src/helpmenu.c:414
-msgid "_Close"
-msgstr "_Stäng"
-
-#: src/gpawizard.c:287
-msgid "_Cancel"
-msgstr "_Avbryt"
-
 #: src/gpgmetools.c:51
 #, c-format
 msgid ""
@@ -1660,52 +1680,52 @@
 msgid "Choose new passphrase"
 msgstr "Mata in _nytt lösen"
 
-#: src/server_access.c:268
+#: src/server_access.c:284
 msgid "No error"
 msgstr "Inget fel"
 
 # gpapa.c: Keyserver-Fehlermeldungen
-#: src/server_access.c:271
+#: src/server_access.c:287
 msgid "Internal error"
 msgstr "Intern fel"
 
-#: src/server_access.c:274
+#: src/server_access.c:290
 msgid "Operation not supported"
 msgstr "Felaktig operation"
 
-#: src/server_access.c:277
+#: src/server_access.c:293
 msgid "Version mismatch"
 msgstr "Felaktig version"
 
-#: src/server_access.c:280
+#: src/server_access.c:296
 msgid "Internal keyserver error"
 msgstr "Intern nyckelserverfel"
 
-#: src/server_access.c:283
+#: src/server_access.c:299
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: src/server_access.c:286
+#: src/server_access.c:302
 msgid "Key not found"
 msgstr "Nyckel ej funnen"
 
-#: src/server_access.c:289
+#: src/server_access.c:305
 msgid "Key already exists on server"
 msgstr "Nyckel fanns redan på nyckelservern"
 
-#: src/server_access.c:292
+#: src/server_access.c:308
 msgid "Key incomplete"
 msgstr "Ofullständig nyckel"
 
-#: src/server_access.c:295
+#: src/server_access.c:311
 msgid "Could not contact keyserver"
 msgstr "Kunde inte koppla upp mot nyckelserver"
 
-#: src/server_access.c:298
+#: src/server_access.c:314
 msgid "Unknown Error"
 msgstr "Okänt fel"
 
-#: src/server_access.c:334
+#: src/server_access.c:350
 #, c-format
 msgid ""
 "Connecting to server \"%s\".\n"
@@ -1714,7 +1734,7 @@
 "Kopplar upp till server \"%s\".\n"
 "Var god dröj..."
 
-#: src/server_access.c:357 src/server_access.c:377
+#: src/server_access.c:373 src/server_access.c:393
 #, c-format
 msgid ""
 "An error ocurred while contacting the server:\n"
@@ -1725,13 +1745,13 @@
 "\n"
 "%s"
 
-#: src/server_access.c:441
+#: src/server_access.c:457
 msgid ""
 "There is no plugin available for the keyserver\n"
 "protocol you specified."
 msgstr "Det finns ingen plugin för nyckelserverprotokollet du specificerade."
 
-#: src/server_access.c:513 src/server_access.c:558
+#: src/server_access.c:530 src/server_access.c:576
 msgid "The keyserver you specified is not valid"
 msgstr "Ogiltig nyckelserver"
 
@@ -1747,14 +1767,6 @@
 msgid "Use _advanced mode:"
 msgstr "Gå till _avancerat läge:"
 
-#: src/settingsdlg.c:136
-msgid "_Yes"
-msgstr "_Ja"
-
-#: src/settingsdlg.c:139
-msgid "_No"
-msgstr "_Nej"
-
 #: src/settingsdlg.c:163
 msgid "Settings"
 msgstr "Inställningar"

Modified: trunk/po/tr.po
===================================================================
--- trunk/po/tr.po	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/po/tr.po	2006-01-17 10:56:54 UTC (rev 738)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gpa 0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-11 10:08+0100\n"
+"POT-Creation-Date: 2006-01-17 10:18+0100\n"
 "PO-Revision-Date: 2004-06-20 14:42+0300\n"
 "Last-Translator: Mert Çetin <mertc at su.sabanciuniv.edu>\n"
 "Language-Team: xTc & Déjà Vu\n"
@@ -15,6 +15,13 @@
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
+#: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
+#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/ownertrustdlg.c:110 src/passwddlg.c:98
+msgid "_Cancel"
+msgstr ""
+
 #: src/encryptdlg.c:135
 msgid "Encrypt files"
 msgstr "Dosyalarý Þifrele"
@@ -272,6 +279,20 @@
 "%s dosyasý zaten var. \n"
 "Üzerine yazmak istiyor musunuz?"
 
+#: src/gpabackupop.c:218 src/gpaexportserverop.c:132
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
+#: src/settingsdlg.c:136
+msgid "_Yes"
+msgstr "_Evet"
+
+#: src/gpabackupop.c:219 src/gpaexportserverop.c:133
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
+#: src/settingsdlg.c:139
+msgid "_No"
+msgstr "_Hayýr"
+
 #: src/gpabackupop.c:231
 #, c-format
 msgid ""
@@ -426,6 +447,13 @@
 msgid "Revoked Key"
 msgstr "Feshedilmiþ Anahtar"
 
+#: src/gpafileencryptop.c:346 src/gpafileencryptop.c:386 src/gpawizard.c:279
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/keyeditdlg.c:150 src/keylist.c:499 src/settingsdlg.c:166
+#: src/verifydlg.c:117
+msgid "_Close"
+msgstr "_Kapat"
+
 #: src/gpafileencryptop.c:359
 msgid "The following key has been revoked by it's owner:"
 msgstr "Þu anahtar sahibi tarafýndan feshedilmiþtir:"
@@ -454,8 +482,8 @@
 #: src/gpafileverifyop.c:169
 #, c-format
 msgid ""
-"GPA found a file that could be a signature of %s.Would you like to verify it "
-"instead?\n"
+"GPA found a file that could be a signature of %s. Would you like to verify "
+"it instead?\n"
 "\n"
 "The file found is: %s"
 msgstr ""
@@ -657,14 +685,6 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpawizard.c:279 src/helpmenu.c:414
-msgid "_Close"
-msgstr "_Kapat"
-
-#: src/gpawizard.c:287
-msgid "_Cancel"
-msgstr ""
-
 #: src/gpgmetools.c:51
 #, c-format
 msgid ""
@@ -1665,51 +1685,51 @@
 msgid "Choose new passphrase"
 msgstr "Yeni þifre seçin"
 
-#: src/server_access.c:268
+#: src/server_access.c:284
 msgid "No error"
 msgstr "Hata yok"
 
-#: src/server_access.c:271
+#: src/server_access.c:287
 msgid "Internal error"
 msgstr "Dahili hata"
 
-#: src/server_access.c:274
+#: src/server_access.c:290
 msgid "Operation not supported"
 msgstr "Ýþlem desteklenmiyor"
 
-#: src/server_access.c:277
+#: src/server_access.c:293
 msgid "Version mismatch"
 msgstr "Sürüm tutmuyor"
 
-#: src/server_access.c:280
+#: src/server_access.c:296
 msgid "Internal keyserver error"
 msgstr "Dahili anahtar sunucusu hatasý"
 
-#: src/server_access.c:283
+#: src/server_access.c:299
 msgid "Out of memory"
 msgstr "Hafýza yetersiz"
 
-#: src/server_access.c:286
+#: src/server_access.c:302
 msgid "Key not found"
 msgstr "Anahtar bulunamadý"
 
-#: src/server_access.c:289
+#: src/server_access.c:305
 msgid "Key already exists on server"
 msgstr "Anahtar sunucuda zaten var"
 
-#: src/server_access.c:292
+#: src/server_access.c:308
 msgid "Key incomplete"
 msgstr "Eksik anahtar"
 
-#: src/server_access.c:295
+#: src/server_access.c:311
 msgid "Could not contact keyserver"
 msgstr "Anahtar sunucusuna baðlanýlamýyor"
 
-#: src/server_access.c:298
+#: src/server_access.c:314
 msgid "Unknown Error"
 msgstr "Bilinmeyen Hata"
 
-#: src/server_access.c:334
+#: src/server_access.c:350
 #, c-format
 msgid ""
 "Connecting to server \"%s\".\n"
@@ -1718,7 +1738,7 @@
 "\"%s\" sunucusuna baðlanýlýyor.\n"
 "Lütfen bekleyin."
 
-#: src/server_access.c:357 src/server_access.c:377
+#: src/server_access.c:373 src/server_access.c:393
 #, c-format
 msgid ""
 "An error ocurred while contacting the server:\n"
@@ -1729,7 +1749,7 @@
 "\n"
 "%s"
 
-#: src/server_access.c:441
+#: src/server_access.c:457
 msgid ""
 "There is no plugin available for the keyserver\n"
 "protocol you specified."
@@ -1737,7 +1757,7 @@
 "Belirttiðiniz anahtar sunucusu protokolü için\n"
 "mevcut bir plugin bulunamadý."
 
-#: src/server_access.c:513 src/server_access.c:558
+#: src/server_access.c:530 src/server_access.c:576
 msgid "The keyserver you specified is not valid"
 msgstr "Belittiðiniz anahtar sunucusu geçersiz"
 
@@ -1753,14 +1773,6 @@
 msgid "Use _advanced mode:"
 msgstr "U_zman modunu kullan:"
 
-#: src/settingsdlg.c:136
-msgid "_Yes"
-msgstr "_Evet"
-
-#: src/settingsdlg.c:139
-msgid "_No"
-msgstr "_Hayýr"
-
 #: src/settingsdlg.c:163
 msgid "Settings"
 msgstr "Ayarlar"

Modified: trunk/po/zh_TW.Big5.po
===================================================================
--- trunk/po/zh_TW.Big5.po	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/po/zh_TW.Big5.po	2006-01-17 10:56:54 UTC (rev 738)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gpa-0.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-11 10:08+0100\n"
+"POT-Creation-Date: 2006-01-17 10:18+0100\n"
 "PO-Revision-Date: 2003-10-20 11:55+0200\n"
 "Last-Translator: Shell Hung <shell at linux.org.hk>\n"
 "Language-Team: Hong Kong Linux User Group <info at linux.org.hk>\n"
@@ -14,6 +14,13 @@
 "Content-Type: text/plain; charset=big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/encryptdlg.c:134 src/expirydlg.c:115 src/filesigndlg.c:123
+#: src/gpabackupop.c:288 src/gpaprogressdlg.c:144 src/gparecvkeydlg.c:95
+#: src/gpawizard.c:287 src/gpgmetools.c:645 src/keygendlg.c:140
+#: src/ownertrustdlg.c:110 src/passwddlg.c:98
+msgid "_Cancel"
+msgstr ""
+
 #: src/encryptdlg.c:135
 msgid "Encrypt files"
 msgstr "¥[±KÀÉ®×"
@@ -271,6 +278,20 @@
 "ÀÉ®× %s ¤w¸g¦s¦b.\n"
 "­n¶i¦æÂмg¶Ü?"
 
+#: src/gpabackupop.c:218 src/gpaexportserverop.c:132
+#: src/gpafileencryptop.c:297 src/gpafileverifyop.c:175 src/gpgmetools.c:133
+#: src/keydeletedlg.c:43 src/keydeletedlg.c:92 src/keysigndlg.c:64
+#: src/settingsdlg.c:136
+msgid "_Yes"
+msgstr "¬O (&Y)"
+
+#: src/gpabackupop.c:219 src/gpaexportserverop.c:133
+#: src/gpafileencryptop.c:298 src/gpafileverifyop.c:176 src/gpgmetools.c:134
+#: src/keydeletedlg.c:45 src/keydeletedlg.c:94 src/keysigndlg.c:66
+#: src/settingsdlg.c:139
+msgid "_No"
+msgstr "§_ (&N)"
+
 #: src/gpabackupop.c:231
 #, c-format
 msgid ""
@@ -425,6 +446,13 @@
 msgid "Revoked Key"
 msgstr "²¾°£±KÆ_"
 
+#: src/gpafileencryptop.c:346 src/gpafileencryptop.c:386 src/gpawizard.c:279
+#: src/gtktools.c:315 src/gtktools.c:348 src/helpmenu.c:414
+#: src/keyeditdlg.c:150 src/keylist.c:499 src/settingsdlg.c:166
+#: src/verifydlg.c:117
+msgid "_Close"
+msgstr "Ãö³¬ (&C)"
+
 #: src/gpafileencryptop.c:359
 msgid "The following key has been revoked by it's owner:"
 msgstr "³o¤½Æ_¤w³Q¹ï¤è¨ú®ø¤F:"
@@ -453,8 +481,8 @@
 #: src/gpafileverifyop.c:169
 #, c-format
 msgid ""
-"GPA found a file that could be a signature of %s.Would you like to verify it "
-"instead?\n"
+"GPA found a file that could be a signature of %s. Would you like to verify "
+"it instead?\n"
 "\n"
 "The file found is: %s"
 msgstr ""
@@ -654,14 +682,6 @@
 msgid "_Apply"
 msgstr ""
 
-#: src/gpawizard.c:279 src/helpmenu.c:414
-msgid "_Close"
-msgstr "Ãö³¬ (&C)"
-
-#: src/gpawizard.c:287
-msgid "_Cancel"
-msgstr ""
-
 #: src/gpgmetools.c:51
 #, c-format
 msgid ""
@@ -1631,51 +1651,51 @@
 msgid "Choose new passphrase"
 msgstr "¿é¤J·s±K½X"
 
-#: src/server_access.c:268
+#: src/server_access.c:284
 msgid "No error"
 msgstr "¨S¦³¿ù»~"
 
-#: src/server_access.c:271
+#: src/server_access.c:287
 msgid "Internal error"
 msgstr "¤º³¡¿ù»~"
 
-#: src/server_access.c:274
+#: src/server_access.c:290
 msgid "Operation not supported"
 msgstr "¾Þ§@¤£¤ä´©"
 
-#: src/server_access.c:277
+#: src/server_access.c:293
 msgid "Version mismatch"
 msgstr "ª©¥»¤£¹ï"
 
-#: src/server_access.c:280
+#: src/server_access.c:296
 msgid "Internal keyserver error"
 msgstr "¤º³¡¤½Æ_¦øªA¾¹¿ù»~"
 
-#: src/server_access.c:283
+#: src/server_access.c:299
 msgid "Out of memory"
 msgstr "°O¾ÐÅ餣¨¬"
 
-#: src/server_access.c:286
+#: src/server_access.c:302
 msgid "Key not found"
 msgstr "§ä¤£¨ì¤½Æ_"
 
-#: src/server_access.c:289
+#: src/server_access.c:305
 msgid "Key already exists on server"
 msgstr "¤w¸g±H¨ì¦øªA¾¹."
 
-#: src/server_access.c:292
+#: src/server_access.c:308
 msgid "Key incomplete"
 msgstr "Æ_¹ï¤£§¹¾ã"
 
-#: src/server_access.c:295
+#: src/server_access.c:311
 msgid "Could not contact keyserver"
 msgstr "§ä¤£¨ì¤½Æ_¦øªA¾¹"
 
-#: src/server_access.c:298
+#: src/server_access.c:314
 msgid "Unknown Error"
 msgstr "¤£¦Wªº¿ù»~"
 
-#: src/server_access.c:334
+#: src/server_access.c:350
 #, c-format
 msgid ""
 "Connecting to server \"%s\".\n"
@@ -1684,7 +1704,7 @@
 "¥¿¦bÁpµ¸¦øªA¾¹ \"%s\" ¤¤\n"
 "½Ðµ¥­Ô..."
 
-#: src/server_access.c:357 src/server_access.c:377
+#: src/server_access.c:373 src/server_access.c:393
 #, c-format
 msgid ""
 "An error ocurred while contacting the server:\n"
@@ -1695,7 +1715,7 @@
 "\n"
 "%s"
 
-#: src/server_access.c:441
+#: src/server_access.c:457
 msgid ""
 "There is no plugin available for the keyserver\n"
 "protocol you specified."
@@ -1703,7 +1723,7 @@
 "¨S¦³»P¦øªA¾¹³q°T¨ó©w¨Ï¥Îªº\n"
 "¥~±¾¼Ò²Õ"
 
-#: src/server_access.c:513 src/server_access.c:558
+#: src/server_access.c:530 src/server_access.c:576
 msgid "The keyserver you specified is not valid"
 msgstr "¦øªA¾¹¨Ã¤£¥¿½T"
 
@@ -1719,14 +1739,6 @@
 msgid "Use _advanced mode:"
 msgstr "¨Ï¥Î¶i¶¥¼Ò¦¡ (&A):"
 
-#: src/settingsdlg.c:136
-msgid "_Yes"
-msgstr "¬O (&Y)"
-
-#: src/settingsdlg.c:139
-msgid "_No"
-msgstr "§_ (&N)"
-
 #: src/settingsdlg.c:163
 msgid "Settings"
 msgstr "³]©w"

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/ChangeLog	2006-01-17 10:56:54 UTC (rev 738)
@@ -1,3 +1,8 @@
+2006-01-17  Werner Koch  <wk at g10code.com>
+
+	Replaced all stock buttons with plain texts for uniform
+	translations.
+
 2006-01-13  Werner Koch  <wk at g10code.com>
 
 	* gpgmeedit.c (edit_fnc): Do not call write for empty strings.

Modified: trunk/src/encryptdlg.c
===================================================================
--- trunk/src/encryptdlg.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/encryptdlg.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -131,7 +131,7 @@
   /* Set up the dialog */
   gtk_dialog_add_buttons (GTK_DIALOG (dialog),
 			  GTK_STOCK_OK, GTK_RESPONSE_OK,
-			  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
+			  _("_Cancel"), GTK_RESPONSE_CANCEL, NULL);
   gtk_window_set_title (GTK_WINDOW (dialog), _("Encrypt files"));
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
   gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, 

Modified: trunk/src/expirydlg.c
===================================================================
--- trunk/src/expirydlg.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/expirydlg.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -112,7 +112,7 @@
                                         GTK_DIALOG_MODAL,
                                         GTK_STOCK_OK,
                                         GTK_RESPONSE_OK,
-                                        GTK_STOCK_CANCEL,
+                                        _("_Cancel"),
                                         GTK_RESPONSE_CANCEL,
                                         NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (window), GTK_RESPONSE_OK);

Modified: trunk/src/filesigndlg.c
===================================================================
--- trunk/src/filesigndlg.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/filesigndlg.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -120,7 +120,7 @@
   /* Set up the dialog */
   gtk_dialog_add_buttons (GTK_DIALOG (dialog),
 			  GTK_STOCK_OK, GTK_RESPONSE_OK,
-			  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
+			  _("_Cancel"), GTK_RESPONSE_CANCEL, NULL);
   gtk_window_set_title (GTK_WINDOW (dialog), _("Sign files"));
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);

Modified: trunk/src/gpabackupop.c
===================================================================
--- trunk/src/gpabackupop.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/gpabackupop.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -215,8 +215,8 @@
 				_("The file %s already exists.\n"
 				  "Do you want to overwrite it?"), filename);
       gtk_dialog_add_buttons (GTK_DIALOG (msgbox),
-                              GTK_STOCK_YES, GTK_RESPONSE_YES,
-                              GTK_STOCK_NO, GTK_RESPONSE_NO, NULL);
+                              _("_Yes"), GTK_RESPONSE_YES,
+                              _("_No"), GTK_RESPONSE_NO, NULL);
       if (gtk_dialog_run (GTK_DIALOG (msgbox)) == GTK_RESPONSE_NO)
         {
           cancelled = TRUE;
@@ -285,7 +285,7 @@
                                         GTK_DIALOG_MODAL,
                                         GTK_STOCK_OK,
                                         GTK_RESPONSE_OK,
-                                        GTK_STOCK_CANCEL,
+                                        _("_Cancel"),
                                         GTK_RESPONSE_CANCEL,
                                         NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (window), GTK_RESPONSE_OK);

Modified: trunk/src/gpaexportserverop.c
===================================================================
--- trunk/src/gpaexportserverop.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/gpaexportserverop.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -129,8 +129,8 @@
 	   "Are you sure you want to distribute this key?"),
 	 server);
   gtk_dialog_add_buttons (GTK_DIALOG (msgbox),
-			  GTK_STOCK_YES, GTK_RESPONSE_YES,
-			  GTK_STOCK_NO, GTK_RESPONSE_NO, NULL);
+			  _("_Yes"), GTK_RESPONSE_YES,
+			  _("_No"), GTK_RESPONSE_NO, NULL);
   if (gtk_dialog_run (GTK_DIALOG (msgbox)) == GTK_RESPONSE_NO)
     {
       gtk_widget_destroy (msgbox);

Modified: trunk/src/gpafileencryptop.c
===================================================================
--- trunk/src/gpafileencryptop.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/gpafileencryptop.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -294,8 +294,8 @@
 
   dialog = gtk_dialog_new_with_buttons (_("Unknown Key"), GTK_WINDOW(parent),
 					GTK_DIALOG_MODAL, 
-					GTK_STOCK_YES, GTK_RESPONSE_YES,
-					GTK_STOCK_NO, GTK_RESPONSE_NO,
+					_("_Yes"), GTK_RESPONSE_YES,
+					_("_No"), GTK_RESPONSE_NO,
 					NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -343,7 +343,7 @@
 
   dialog = gtk_dialog_new_with_buttons (_("Revoked Key"), GTK_WINDOW(parent),
 					GTK_DIALOG_MODAL, 
-					GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+					_("_Close"), GTK_RESPONSE_CLOSE,
 					NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -383,7 +383,7 @@
 
   dialog = gtk_dialog_new_with_buttons (_("Revoked Key"), GTK_WINDOW(parent),
 					GTK_DIALOG_MODAL, 
-					GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+					_("_Close"), GTK_RESPONSE_CLOSE,
 					NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);

Modified: trunk/src/gpafileverifyop.c
===================================================================
--- trunk/src/gpafileverifyop.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/gpafileverifyop.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -172,8 +172,8 @@
   gboolean result;
   
   gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-			  GTK_STOCK_YES, GTK_RESPONSE_YES,
-			  GTK_STOCK_NO, GTK_RESPONSE_NO, NULL);
+			  _("_Yes"), GTK_RESPONSE_YES,
+			  _("_No"), GTK_RESPONSE_NO, NULL);
   result = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES);
   gtk_widget_destroy (dialog);
   

Modified: trunk/src/gpaprogressdlg.c
===================================================================
--- trunk/src/gpaprogressdlg.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/gpaprogressdlg.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -19,6 +19,7 @@
  */
 
 #include "gpaprogressdlg.h"
+#include "i18n.h"  
 
 /* Internal functions */
 static void
@@ -140,7 +141,7 @@
 			       dialog->progress_bar);
   /* Set up the dialog */
   gtk_dialog_add_button (GTK_DIALOG (dialog),
-			 GTK_STOCK_CANCEL,
+			 _("_Cancel"),
 			 GTK_RESPONSE_CANCEL);
   /* FIXME: Cancelling is not supported yet by GPGME */
   gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL,

Modified: trunk/src/gparecvkeydlg.c
===================================================================
--- trunk/src/gparecvkeydlg.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/gparecvkeydlg.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -92,7 +92,7 @@
   gtk_dialog_add_buttons (GTK_DIALOG (dialog),
 			  GTK_STOCK_OK,
 			  GTK_RESPONSE_OK,
-			  GTK_STOCK_CANCEL,
+			  _("_Cancel"),
 			  GTK_RESPONSE_CANCEL, NULL);
   gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),5);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);

Modified: trunk/src/gpgmetools.c
===================================================================
--- trunk/src/gpgmetools.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/gpgmetools.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -130,8 +130,8 @@
 	 _("The file %s already exists.\n"
 	   "Do you want to overwrite it?"), filename);
       gtk_dialog_add_buttons (GTK_DIALOG (msgbox),
-			      GTK_STOCK_YES, GTK_RESPONSE_YES,
-			      GTK_STOCK_NO, GTK_RESPONSE_NO, NULL);
+			      _("_Yes"), GTK_RESPONSE_YES,
+			      _("_No"), GTK_RESPONSE_NO, NULL);
       if (gtk_dialog_run (GTK_DIALOG (msgbox)) == GTK_RESPONSE_NO)
 	{
 	  gtk_widget_destroy (msgbox);
@@ -642,7 +642,7 @@
 					NULL, GTK_DIALOG_MODAL,
 					GTK_STOCK_OK,
 					GTK_RESPONSE_OK,
-                                            GTK_STOCK_CANCEL,
+                                        _("_Cancel"),
 					GTK_RESPONSE_CANCEL,
 					NULL);
   hbox = gtk_hbox_new (FALSE, 0);

Modified: trunk/src/gtktools.c
===================================================================
--- trunk/src/gtktools.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/gtktools.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -312,7 +312,7 @@
                                              (messenger ? 
                                              GTK_WINDOW(messenger) : NULL),
                                              GTK_DIALOG_MODAL,
-                                             GTK_STOCK_CLOSE,
+                                             _("_Close"),
                                              GTK_RESPONSE_CLOSE,
                                              NULL);
   gtk_container_set_border_width (GTK_CONTAINER (windowError), 5);
@@ -345,7 +345,7 @@
 					(messenger ? 
 					 GTK_WINDOW(messenger) : NULL),
 					GTK_DIALOG_MODAL,
-					GTK_STOCK_CLOSE,
+					_("_Close"),
 					GTK_RESPONSE_CLOSE,
 					NULL);
   gtk_container_set_border_width (GTK_CONTAINER (window), 5);

Modified: trunk/src/keydeletedlg.c
===================================================================
--- trunk/src/keydeletedlg.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/keydeletedlg.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -40,9 +40,9 @@
   window = gtk_dialog_new_with_buttons (_("Removing Secret Key"),
                                         GTK_WINDOW(parent),
                                         GTK_DIALOG_MODAL,
-                                        GTK_STOCK_YES,
+                                        _("_Yes"),
                                         GTK_RESPONSE_YES,
-                                        GTK_STOCK_NO,
+                                        _("_No"),
                                         GTK_RESPONSE_NO,
                                         NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (window), GTK_RESPONSE_NO);
@@ -89,9 +89,9 @@
 
   window = gtk_dialog_new_with_buttons (_("Remove Key"), GTK_WINDOW(parent),
                                         GTK_DIALOG_MODAL,
-                                        GTK_STOCK_YES,
+                                        _("_Yes"),
                                         GTK_RESPONSE_YES,
-                                        GTK_STOCK_NO,
+                                        _("_No"),
                                         GTK_RESPONSE_NO,
                                         NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (window), GTK_RESPONSE_YES);

Modified: trunk/src/keyeditdlg.c
===================================================================
--- trunk/src/keyeditdlg.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/keyeditdlg.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -147,7 +147,7 @@
 
   gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Key"));
   gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-			  GTK_STOCK_CLOSE,
+			  _("_Close"),
 			  GTK_RESPONSE_CLOSE,
 			  NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);

Modified: trunk/src/keygendlg.c
===================================================================
--- trunk/src/keygendlg.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/keygendlg.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -137,7 +137,7 @@
                                                 GTK_DIALOG_MODAL,
                                                 GTK_STOCK_OK,
                                                 GTK_RESPONSE_OK,
-                                                GTK_STOCK_CANCEL,
+                                                _("_Cancel"),
                                                 GTK_RESPONSE_CANCEL,
                                                 NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (windowGenerate),

Modified: trunk/src/keylist.c
===================================================================
--- trunk/src/keylist.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/keylist.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -496,7 +496,7 @@
   
   window = gtk_dialog_new_with_buttons (_("GPA Warning"), NULL,
 					GTK_DIALOG_MODAL,
-					GTK_STOCK_CLOSE,
+					_("_Close"),
 					GTK_RESPONSE_CLOSE,
 					NULL);
   gtk_container_set_border_width (GTK_CONTAINER (window), 5);

Modified: trunk/src/keysigndlg.c
===================================================================
--- trunk/src/keysigndlg.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/keysigndlg.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -61,9 +61,9 @@
 
   window = gtk_dialog_new_with_buttons (_("Sign Key"), GTK_WINDOW(parent),
                                         GTK_DIALOG_MODAL,
-                                        GTK_STOCK_YES,
+                                        _("_Yes"),
                                         GTK_RESPONSE_YES,
-                                        GTK_STOCK_NO,
+                                        _("_No"),
                                         GTK_RESPONSE_NO,
                                         NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (window), GTK_RESPONSE_YES);

Modified: trunk/src/ownertrustdlg.c
===================================================================
--- trunk/src/ownertrustdlg.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/ownertrustdlg.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -107,7 +107,7 @@
                                         GTK_DIALOG_MODAL,
                                         GTK_STOCK_OK,
                                         GTK_RESPONSE_OK,
-                                        GTK_STOCK_CANCEL,
+                                        _("_Cancel"),
                                         GTK_RESPONSE_CANCEL,
                                         NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);

Modified: trunk/src/passwddlg.c
===================================================================
--- trunk/src/passwddlg.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/passwddlg.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -95,7 +95,7 @@
                                         GTK_DIALOG_MODAL,
                                         GTK_STOCK_OK,
                                         GTK_RESPONSE_OK,
-                                        GTK_STOCK_CANCEL,
+                                        _("_Cancel"),
                                         GTK_RESPONSE_CANCEL, NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
   vbox = GTK_DIALOG (dialog)->vbox;

Modified: trunk/src/settingsdlg.c
===================================================================
--- trunk/src/settingsdlg.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/settingsdlg.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -163,7 +163,7 @@
   dialog = gtk_dialog_new_with_buttons (_("Settings"),
                                         NULL,
                                         0,
-                                        GTK_STOCK_CLOSE,
+                                        _("_Close"),
                                         GTK_RESPONSE_CLOSE, NULL);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);

Modified: trunk/src/verifydlg.c
===================================================================
--- trunk/src/verifydlg.c	2006-01-13 10:33:11 UTC (rev 737)
+++ trunk/src/verifydlg.c	2006-01-17 10:56:54 UTC (rev 738)
@@ -114,7 +114,7 @@
   dialog->ctx = gpa_context_new ();
   /* Set up the dialog */
   gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-			  GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
+			  _("_Close"), GTK_RESPONSE_CLOSE, NULL);
   gtk_window_set_title (GTK_WINDOW (dialog), _("Verify files"));
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
   gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);



More information about the Gpa-commits mailing list