diff --git a/g10/ChangeLog b/g10/ChangeLog index 21f258bfa..c47bb4a4f 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,10 @@ +2006-07-31 Werner Koch + + * encode.c (encode_crypt_files): Invalidate the whole fd cache. + This is a workaround for problems in iobuf's stupid fd cache. + * decrypt.c (decrypt_messages): Ditto. + * verify.c (verify_files): Ditto. + 2006-07-26 Werner Koch * keygen.c (gen_card_key_with_backup): Initialize sk_{un}protected. diff --git a/g10/decrypt.c b/g10/decrypt.c index 3482e3915..171e265a9 100644 --- a/g10/decrypt.c +++ b/g10/decrypt.c @@ -183,6 +183,7 @@ decrypt_messages(int nfiles, char *files[]) next_file: /* Note that we emit file_done even after an error. */ write_status( STATUS_FILE_DONE ); + iobuf_ioctl( NULL, 2, 0, NULL); /* Invalidate entire cache. */ xfree(output); } diff --git a/g10/encode.c b/g10/encode.c index 14ecbb54d..251ea3e2c 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -858,6 +858,7 @@ encode_crypt_files(int nfiles, char **files, STRLIST remusr) log_error("encryption of `%s' failed: %s\n", print_fname_stdin(line), g10_errstr(rc) ); write_status( STATUS_FILE_DONE ); + iobuf_ioctl( NULL, 2, 0, NULL); /* Invalidate entire cache. */ } } else @@ -869,6 +870,7 @@ encode_crypt_files(int nfiles, char **files, STRLIST remusr) log_error("encryption of `%s' failed: %s\n", print_fname_stdin(*files), g10_errstr(rc) ); write_status( STATUS_FILE_DONE ); + iobuf_ioctl( NULL, 2, 0, NULL); /* Invalidate entire cache. */ files++; } } diff --git a/g10/verify.c b/g10/verify.c index 941481aac..082db89de 100644 --- a/g10/verify.c +++ b/g10/verify.c @@ -197,12 +197,15 @@ verify_files( int nfiles, char **files ) * spaces, so that we can process nearly all filenames */ line[strlen(line)-1] = 0; verify_one_file( line ); + iobuf_ioctl( NULL, 2, 0, NULL); /* Invalidate entire cache. */ } } else { /* take filenames from the array */ - for(i=0; i < nfiles; i++ ) + for(i=0; i < nfiles; i++ ) { verify_one_file( files[i] ); + iobuf_ioctl( NULL, 2, 0, NULL); /* Invalidate entire cache. */ + } } return 0; } diff --git a/po/be.po b/po/be.po index ca77d5348..380940c6d 100644 --- a/po/be.po +++ b/po/be.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2003-10-30 16:35+0200\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -670,10 +670,20 @@ msgstr "сакрэтны ключ недаступны" msgid "Invalid command (try \"help\")\n" msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "сакрэтны ключ недаступны" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "збой падпісаньня: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/ca.po b/po/ca.po index d25db8d5d..f156143ad 100644 --- a/po/ca.po +++ b/po/ca.po @@ -27,7 +27,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.0\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2005-02-04 02:04+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -719,10 +719,20 @@ msgstr "" msgid "Invalid command (try \"help\")\n" msgstr "L'ordre no és vàlida (proveu «help»)\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "la clau secreta no està disponible" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "no s'ha pogut eliminar el bloc de claus: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/cs.po b/po/cs.po index 00c5acdeb..7965b0f97 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.3.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2004-11-26 09:12+0200\n" "Last-Translator: Roman Pavlik \n" "Language-Team: Czech \n" @@ -663,10 +663,20 @@ msgstr "administr msgid "Invalid command (try \"help\")\n" msgstr "Neplatn pkaz (zkuste \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "tajn kl nen dostupn" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "Prosm vote kartu a stisknte enter. Operaci zrute stisknutm 'z': " +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "smazn bloku kle se nezdailo: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/da.po b/po/da.po index 2af49232e..7bcfb20e6 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2003-12-03 16:11+0100\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" @@ -692,10 +692,20 @@ msgstr "skriver hemmeligt certifikat til '%s'\n" msgid "Invalid command (try \"help\")\n" msgstr "" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "hemmelig ngle ikke tilgngelig" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "fjernelse af beskyttelse fejlede: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/de.po b/po/de.po index a632a30d4..bf0dabe99 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.4.1\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2006-06-28 20:54+0200\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" @@ -665,12 +665,22 @@ msgstr "Admin-Befehle sind nicht erlaubt\n" msgid "Invalid command (try \"help\")\n" msgstr "Ungltiger Befehl (versuchen Sie's mal mit \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "Geheimer Schlssel ist nicht vorhanden" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" "Legen Sie die Karte ein und drcken Sie 'Eingabe'; drcken Sie 'c' um " "abzubrechen: " +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "lschen des Schlsselblocks fehlgeschlagen: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/el.po b/po/el.po index e7df056df..e4dc91eab 100644 --- a/po/el.po +++ b/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.1.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2003-06-27 12:00+0200\n" "Last-Translator: Dokianakis Theofanis \n" "Language-Team: Greek \n" @@ -694,10 +694,20 @@ msgstr " msgid "Invalid command (try \"help\")\n" msgstr " ( \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr " " + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr " block : %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/eo.po b/po/eo.po index ce4f00267..59e92e35a 100644 --- a/po/eo.po +++ b/po/eo.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.6d\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2002-04-14 14:33+0100\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" @@ -691,10 +691,20 @@ msgstr "skribas sekretan msgid "Invalid command (try \"help\")\n" msgstr "Nevalida komando (provu per \"helpo\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "sekreta losilo ne havebla" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "forvio de losilbloko malsukcesis: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/es.po b/po/es.po index 93dae4659..4f2b044ed 100644 --- a/po/es.po +++ b/po/es.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gnupg 1.4.1\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2005-03-25 16:50+0100\n" "Last-Translator: Jaime Surez \n" "Language-Team: Spanish \n" @@ -675,10 +675,20 @@ msgstr "No se permiten msgid "Invalid command (try \"help\")\n" msgstr "Orden invlida (pruebe \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "clave secreta no disponible" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "Inserte la tarjeta y pulse Intro o escriba 'c' para cancelar: " +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "borrado de bloque de anillo de claves fallido: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/et.po b/po/et.po index 8d9e5fd04..7cf6a2d3c 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2004-06-17 11:04+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" @@ -691,10 +691,20 @@ msgstr "kirjutan salajase v msgid "Invalid command (try \"help\")\n" msgstr "Vigane ksklus (proovige \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "salajane vti ei ole kttesaadav" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "vtmebloki kustutamine ebannestus: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/fi.po b/po/fi.po index 94e3908ec..273cce964 100644 --- a/po/fi.po +++ b/po/fi.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2004-06-16 22:40+0300\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" @@ -712,10 +712,20 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n" msgid "Invalid command (try \"help\")\n" msgstr "Komento ei kelpaa (kirjoita \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "salaista avainta ei löydy" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "avainlohkojen poisto epäonnistui: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/fr.po b/po/fr.po index b3495d0d5..a1cb36fe0 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.2rc2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2005-06-28 00:24+0200\n" "Last-Translator: Gal Quri \n" "Language-Team: French \n" @@ -682,10 +682,20 @@ msgstr "Les commandes d'administration ne sont pas permises\n" msgid "Invalid command (try \"help\")\n" msgstr "Commande invalide (essayez help)\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "la cl secrte n'est pas disponible" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "Insrez la carte et tapez entre ou entrez 'c' pour annuler: " +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "la suppression du bloc de cls a chou : %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/gl.po b/po/gl.po index 1e521bba7..631c059a9 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.4\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2003-12-04 11:39+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -695,10 +695,20 @@ msgstr "gravando a chave secreta en `%s'\n" msgid "Invalid command (try \"help\")\n" msgstr "Comando incorrecto (tente \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "a chave secreta non est dispoible" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "fallou o borrado do bloque de chaves: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/hu.po b/po/hu.po index b21ad9042..f57cf1e7e 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2004-06-19 21:53+0200\n" "Last-Translator: Nagy Ferenc Lszl \n" "Language-Team: Hungarian \n" @@ -693,10 +693,20 @@ msgstr " msgid "Invalid command (try \"help\")\n" msgstr "rvnytelen parancs! (Prblja a sgt: \"help\".)\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "titkos kulcs nem ll rendelkezsre" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "A kulcsblokk trlse sikertelen: %s.\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/id.po b/po/id.po index 5d8058f17..0337b71d1 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-id\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2004-06-17 16:32+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -695,10 +695,20 @@ msgstr "menulis kunci rahasia ke `%s'\n" msgid "Invalid command (try \"help\")\n" msgstr "Perintah tidak valid (coba \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "kunci rahasia tidak tersedia" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "gagal menghapus keyblok: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/it.po b/po/it.po index 9dd514379..c5703bd17 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.1.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2004-06-16 17:01+0200\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" @@ -697,10 +697,20 @@ msgstr "scrittura della chiave segreta in `%s'\n" msgid "Invalid command (try \"help\")\n" msgstr "Comando non valido (prova \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "la chiave segreta non disponibile" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "cancellazione del keyblock fallita: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/ja.po b/po/ja.po index 76ba1998a..f0461318c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.3.92\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2004-11-23 11:14+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" @@ -664,10 +664,20 @@ msgstr " msgid "Invalid command (try \"help\")\n" msgstr "̵ʥޥ (helpɤ򻲾)\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "̩ޤ" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "ɤreturnǤĤ'c'Ǽä: " +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "֥åκ˼Ԥޤ: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/nb.po b/po/nb.po index aa777cc45..515db7b2c 100644 --- a/po/nb.po +++ b/po/nb.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.3\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-04-03 11:40+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2006-06-13 20:31+0200\n" "Last-Translator: Trond Endrestl \n" "Language-Team: Norwegian Bokml \n" @@ -43,11 +43,11 @@ msgid "waiting for lock on `%s'...\n" msgstr "venter p lsing av %s ...\n" #: cipher/random.c:448 g10/card-util.c:678 g10/card-util.c:747 -#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488 -#: g10/gpg.c:997 g10/gpg.c:3365 g10/import.c:195 g10/keygen.c:2323 +#: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:474 +#: g10/gpg.c:1003 g10/gpg.c:3461 g10/import.c:195 g10/keygen.c:2385 #: g10/keyring.c:1525 g10/openfile.c:186 g10/openfile.c:342 -#: g10/plaintext.c:482 g10/sign.c:779 g10/sign.c:941 g10/sign.c:1054 -#: g10/sign.c:1204 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540 +#: g10/plaintext.c:481 g10/sign.c:808 g10/sign.c:1001 g10/sign.c:1114 +#: g10/sign.c:1264 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540 #: g10/tdbio.c:605 #, c-format msgid "can't open `%s': %s\n" @@ -80,9 +80,9 @@ msgstr "kan ikke lese msgid "note: random_seed file not updated\n" msgstr "merk: random_seed-fila ble ikke oppdatert\n" -#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2802 -#: g10/keygen.c:2832 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263 -#: g10/openfile.c:357 g10/sign.c:797 g10/sign.c:1070 g10/tdbio.c:536 +#: cipher/random.c:544 g10/exec.c:481 g10/gpg.c:1002 g10/keygen.c:2864 +#: g10/keygen.c:2894 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:263 +#: g10/openfile.c:357 g10/sign.c:826 g10/sign.c:1130 g10/tdbio.c:536 #, c-format msgid "can't create `%s': %s\n" msgstr "kan ikke opprette %s: %s\n" @@ -305,75 +305,75 @@ msgstr "bekrefting av Admin PIN er forel msgid "can't access %s - invalid OpenPGP card?\n" msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n" -#: g10/armor.c:318 +#: g10/armor.c:320 #, c-format msgid "armor: %s\n" msgstr "armor: %s\n" -#: g10/armor.c:357 +#: g10/armor.c:359 msgid "invalid armor header: " msgstr "ugyldig armorheader: " -#: g10/armor.c:368 +#: g10/armor.c:370 msgid "armor header: " msgstr "armorheader: " -#: g10/armor.c:379 +#: g10/armor.c:381 msgid "invalid clearsig header\n" msgstr "ugyldig clearsigheader\n" -#: g10/armor.c:431 +#: g10/armor.c:433 msgid "nested clear text signatures\n" msgstr "nstede klartekstsignaturer\n" -#: g10/armor.c:566 +#: g10/armor.c:568 msgid "unexpected armor: " msgstr "uforventet armering:" -#: g10/armor.c:578 +#: g10/armor.c:580 msgid "invalid dash escaped line: " msgstr "ugyldig bindestrekbeskyttet linje: " -#: g10/armor.c:730 g10/armor.c:1337 +#: g10/armor.c:734 g10/armor.c:1343 #, c-format msgid "invalid radix64 character %02X skipped\n" msgstr "hoppet over ugyldig radix64-tegn %02x\n" -#: g10/armor.c:773 +#: g10/armor.c:777 msgid "premature eof (no CRC)\n" msgstr "for tidlig eof (ingen CRC)\n" -#: g10/armor.c:807 +#: g10/armor.c:811 msgid "premature eof (in CRC)\n" msgstr "for tidlig eof (i CRC)\n" -#: g10/armor.c:815 +#: g10/armor.c:819 msgid "malformed CRC\n" msgstr "misdannet CRC\n" -#: g10/armor.c:819 g10/armor.c:1374 +#: g10/armor.c:823 g10/armor.c:1380 #, c-format msgid "CRC error; %06lX - %06lX\n" msgstr "CRC-feil; %06lX - %06lX\n" -#: g10/armor.c:839 +#: g10/armor.c:843 msgid "premature eof (in trailer)\n" msgstr "for tidlig eof (i trailer)\n" -#: g10/armor.c:843 +#: g10/armor.c:847 msgid "error in trailer line\n" msgstr "feil i trailerlinje\n" -#: g10/armor.c:1152 +#: g10/armor.c:1158 msgid "no valid OpenPGP data found.\n" msgstr "ingen gyldig OpenPGP-data funnet.\n" -#: g10/armor.c:1157 +#: g10/armor.c:1163 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "ugyldig armor: linje lengre enn %d tegn\n" -#: g10/armor.c:1161 +#: g10/armor.c:1167 msgid "" "quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" @@ -390,13 +390,13 @@ msgid "OpenPGP card no. %s detected\n" msgstr "OpenPGP-kortnummer %s oppdaget\n" #: g10/card-util.c:76 g10/card-util.c:1406 g10/delkey.c:128 g10/keyedit.c:1524 -#: g10/keygen.c:2507 g10/revoke.c:218 g10/revoke.c:456 +#: g10/keygen.c:2569 g10/revoke.c:218 g10/revoke.c:456 msgid "can't do this in batch mode\n" msgstr "kan ikke gjre dette i batchmodus\n" #: g10/card-util.c:103 g10/card-util.c:1132 g10/card-util.c:1215 -#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1339 -#: g10/keygen.c:1406 +#: g10/keyedit.c:425 g10/keyedit.c:446 g10/keyedit.c:460 g10/keygen.c:1381 +#: g10/keygen.c:1448 msgid "Your selection? " msgstr "Ditt valg? " @@ -563,7 +563,7 @@ msgid " (3) Authentication key\n" msgstr " (3) Autentiseringsnkkel\n" #: g10/card-util.c:1143 g10/card-util.c:1226 g10/keyedit.c:946 -#: g10/keygen.c:1343 g10/keygen.c:1371 g10/keygen.c:1445 g10/revoke.c:685 +#: g10/keygen.c:1385 g10/keygen.c:1413 g10/keygen.c:1487 g10/revoke.c:685 msgid "Invalid selection.\n" msgstr "Ugyldig valg.\n" @@ -663,9 +663,21 @@ msgstr "Admin-kommandoer er ikke tillatt\n" msgid "Invalid command (try \"help\")\n" msgstr "Ugyldig kommando (prv help)\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "hemmelig nkkel er ikke tilgjengelig" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " -msgstr "Vennligst sett inn kortet og trykk p enter eller tast inn c for avbryte: " +msgstr "" +"Vennligst sett inn kortet og trykk p enter eller tast inn c for " +"avbryte: " + +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "sleting av nkkelblokk mislyktes: %s\n" #: g10/cardglue.c:573 #, c-format @@ -704,23 +716,23 @@ msgstr "Gjenta denne PIN: " msgid "PIN not correctly repeated; try again" msgstr "PIN ble ikke gjentatt korrekt; prv igjen" -#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3725 g10/keyring.c:377 +#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3826 g10/keyring.c:377 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157 #, c-format msgid "can't open `%s'\n" msgstr "kan ikke pne %s\n" -#: g10/decrypt.c:105 g10/encode.c:853 +#: g10/decrypt.c:105 g10/encode.c:839 msgid "--output doesn't work for this command\n" msgstr "--output virker ikke for denne kommandoen\n" -#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1704 +#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3387 g10/keyserver.c:1700 #: g10/revoke.c:228 #, c-format msgid "key \"%s\" not found: %s\n" msgstr "nkkelen %s ble ikke funnet: %s\n" -#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2330 g10/keyserver.c:1718 +#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2349 g10/keyserver.c:1714 #: g10/revoke.c:234 g10/revoke.c:478 #, c-format msgid "error reading keyblock: %s\n" @@ -760,7 +772,7 @@ msgstr "det finnes en hemmelig n msgid "use option \"--delete-secret-keys\" to delete it first.\n" msgstr "bruk valget --delete-secret-keys for slette den frst.\n" -#: g10/encode.c:213 g10/sign.c:1224 +#: g10/encode.c:213 g10/sign.c:1284 #, c-format msgid "error creating passphrase: %s\n" msgstr "feil ved opprettelse av passfrase: %s\n" @@ -774,57 +786,62 @@ msgstr "kan ikke bruke en symmetrisk ESK-pakke p msgid "using cipher %s\n" msgstr "bruker cipher %s\n" -#: g10/encode.c:241 g10/encode.c:550 +#: g10/encode.c:241 g10/encode.c:536 #, c-format msgid "`%s' already compressed\n" msgstr "%s er allerede komprimert\n" -#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:564 +#: g10/encode.c:292 g10/encode.c:584 g10/sign.c:593 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ADVARSEL: %s er en tom fil\n" -#: g10/encode.c:470 +#: g10/encode.c:456 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n" msgstr "" "du kan bare kryptere med RSA-nkler med lengder p 2048 bits eller mindre i " "--pgp2-modus\n" -#: g10/encode.c:494 +#: g10/encode.c:480 #, c-format msgid "reading from `%s'\n" msgstr "leser fra %s\n" -#: g10/encode.c:522 +#: g10/encode.c:508 msgid "" "unable to use the IDEA cipher for all of the keys you are encrypting to.\n" msgstr "" "klarte ikke bruke IDEA-algoritmen for alle nklene du krypterer til.\n" -#: g10/encode.c:532 +#: g10/encode.c:518 #, c-format msgid "" "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n" -msgstr "ADVARSEL: ptvinging av symmetrisk cipher %s (%d) bryter med mottakerens preferanser\n" +msgstr "" +"ADVARSEL: ptvinging av symmetrisk cipher %s (%d) bryter med mottakerens " +"preferanser\n" -#: g10/encode.c:642 g10/sign.c:903 +#: g10/encode.c:628 g10/sign.c:963 #, c-format msgid "" "WARNING: forcing compression algorithm %s (%d) violates recipient " "preferences\n" -msgstr "ADVARSEL: tvang av kompresjonsalgoritme %s (%d) bryter med mottakerens preferanser\n" +msgstr "" +"ADVARSEL: tvang av kompresjonsalgoritme %s (%d) bryter med mottakerens " +"preferanser\n" -#: g10/encode.c:729 +#: g10/encode.c:715 #, c-format msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n" -msgstr "ptvinging av symmetrisk cipher %s (%d) bryter med mottakerens preferanser\n" +msgstr "" +"ptvinging av symmetrisk cipher %s (%d) bryter med mottakerens preferanser\n" -#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851 +#: g10/encode.c:785 g10/pkclist.c:803 g10/pkclist.c:851 #, c-format msgid "you may not use %s while in %s mode\n" msgstr "du kan ikke bruke %s i %s modus\n" -#: g10/encode.c:826 +#: g10/encode.c:812 #, c-format msgid "%s/%s encrypted for: \"%s\"\n" msgstr "%s/%s kryptert for: \"%s\"\n" @@ -842,7 +859,9 @@ msgstr "kryptert med en ukjent algoritme %d\n" #: g10/encr-data.c:93 msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" -msgstr "ADVARSEL: meldingen er kryptert med en svak nkkel for den symmetriske cipher.\n" +msgstr "" +"ADVARSEL: meldingen er kryptert med en svak nkkel for den symmetriske " +"cipher.\n" #: g10/encr-data.c:104 msgid "problem handling encrypted packet\n" @@ -852,54 +871,57 @@ msgstr "problem ved h msgid "no remote program execution supported\n" msgstr "fjernutfring av programmer er ikke stttet\n" -#: g10/exec.c:173 g10/openfile.c:415 +#: g10/exec.c:176 g10/openfile.c:415 #, c-format msgid "can't create directory `%s': %s\n" msgstr "kan ikke opprette katalogen %s: %s\n" -#: g10/exec.c:314 +#: g10/exec.c:317 msgid "" "external program calls are disabled due to unsafe options file permissions\n" -msgstr "eksterne programkall er utkoblet p grunn av utrygge rettigheter p konfigurasjonsfila\n" +msgstr "" +"eksterne programkall er utkoblet p grunn av utrygge rettigheter p " +"konfigurasjonsfila\n" -#: g10/exec.c:344 +#: g10/exec.c:347 msgid "this platform requires temporary files when calling external programs\n" -msgstr "denne plattformen krever midlertidige filer ved kall p eksterne programmer\n" +msgstr "" +"denne plattformen krever midlertidige filer ved kall p eksterne programmer\n" -#: g10/exec.c:422 +#: g10/exec.c:425 #, c-format msgid "unable to execute program `%s': %s\n" msgstr "kunne ikke utfre program %s: %s\n" -#: g10/exec.c:425 +#: g10/exec.c:428 #, c-format msgid "unable to execute shell `%s': %s\n" msgstr "kunne ikke utfre skallet %s: %s\n" -#: g10/exec.c:510 +#: g10/exec.c:513 #, c-format msgid "system error while calling external program: %s\n" msgstr "systemfeil under kall p eksternt program: %s\n" -#: g10/exec.c:521 g10/exec.c:587 +#: g10/exec.c:524 g10/exec.c:590 msgid "unnatural exit of external program\n" msgstr "unaturlig avslutning av eksternt program\n" -#: g10/exec.c:536 +#: g10/exec.c:539 msgid "unable to execute external program\n" msgstr "klarte ikke kjre eksternt program\n" -#: g10/exec.c:552 +#: g10/exec.c:555 #, c-format msgid "unable to read external program response: %s\n" msgstr "klarte ikke lese reponsen fra eksternt program: %s\n" -#: g10/exec.c:598 g10/exec.c:605 +#: g10/exec.c:601 g10/exec.c:608 #, c-format msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n" msgstr "ADVARSEL: klarte ikke fjerne midlertidig fil (%s) %s: %s\n" -#: g10/exec.c:610 +#: g10/exec.c:613 #, c-format msgid "WARNING: unable to remove temp directory `%s': %s\n" msgstr "ADVARSEL: klarte ikke fjerne midlertidig katalog %s: %s\n" @@ -965,7 +987,7 @@ msgstr "ADVARSEL: hemmelig n msgid "WARNING: nothing exported\n" msgstr "ADVARSEL: ingenting eksportert\n" -#: g10/gpg.c:372 +#: g10/gpg.c:375 msgid "" "@Commands:\n" " " @@ -973,127 +995,127 @@ msgstr "" "@Kommandoer:\n" " " -#: g10/gpg.c:374 +#: g10/gpg.c:377 msgid "|[file]|make a signature" msgstr "|[fil]|lage en signatur" -#: g10/gpg.c:375 +#: g10/gpg.c:378 msgid "|[file]|make a clear text signature" msgstr "|[fil]|lage en klartekstsignatur" -#: g10/gpg.c:376 +#: g10/gpg.c:379 msgid "make a detached signature" msgstr "lage en adskilt signatur" -#: g10/gpg.c:377 +#: g10/gpg.c:380 msgid "encrypt data" msgstr "kryptere data" -#: g10/gpg.c:379 +#: g10/gpg.c:382 msgid "encryption only with symmetric cipher" msgstr "kryptering med bare symmetrisk cipher" -#: g10/gpg.c:381 +#: g10/gpg.c:384 msgid "decrypt data (default)" msgstr "dekryptere data (standard)" -#: g10/gpg.c:383 +#: g10/gpg.c:386 msgid "verify a signature" msgstr "bekrefte en signatur" -#: g10/gpg.c:385 +#: g10/gpg.c:388 msgid "list keys" msgstr "liste nkler" -#: g10/gpg.c:387 +#: g10/gpg.c:390 msgid "list keys and signatures" msgstr "liste nkler og signaturer" -#: g10/gpg.c:388 +#: g10/gpg.c:391 msgid "list and check key signatures" msgstr "vise og sjekke nkkelsignaturer" -#: g10/gpg.c:389 +#: g10/gpg.c:392 msgid "list keys and fingerprints" msgstr "liste nkler og fingeravtrykk" -#: g10/gpg.c:390 +#: g10/gpg.c:393 msgid "list secret keys" msgstr "liste hemmelige nkler" -#: g10/gpg.c:391 +#: g10/gpg.c:394 msgid "generate a new key pair" msgstr "generere et nytt nkkelpar" -#: g10/gpg.c:392 +#: g10/gpg.c:395 msgid "remove keys from the public keyring" msgstr "fjerne nkler fra det offentlige nkkelknippet" -#: g10/gpg.c:394 +#: g10/gpg.c:397 msgid "remove keys from the secret keyring" msgstr "fjerne nkler fra det hemmelige nkkelknippet" -#: g10/gpg.c:395 +#: g10/gpg.c:398 msgid "sign a key" msgstr "signere en nkkel" -#: g10/gpg.c:396 +#: g10/gpg.c:399 msgid "sign a key locally" msgstr "signere en nkkel lokalt" -#: g10/gpg.c:397 +#: g10/gpg.c:400 msgid "sign or edit a key" msgstr "signere eller redigere en nkkel" -#: g10/gpg.c:398 +#: g10/gpg.c:401 msgid "generate a revocation certificate" msgstr "generere et opphevingssertifikat" -#: g10/gpg.c:400 +#: g10/gpg.c:403 msgid "export keys" msgstr "eksportere nkler" -#: g10/gpg.c:401 +#: g10/gpg.c:404 msgid "export keys to a key server" msgstr "eksportere nkler til en nkkelserver" -#: g10/gpg.c:402 +#: g10/gpg.c:405 msgid "import keys from a key server" msgstr "importere nkler fra en nkkelserver" -#: g10/gpg.c:404 +#: g10/gpg.c:407 msgid "search for keys on a key server" msgstr "ske etter nkler p en nkkelserver" -#: g10/gpg.c:406 +#: g10/gpg.c:409 msgid "update all keys from a keyserver" msgstr "oppdatere alle nklene fra en nkkelserver" -#: g10/gpg.c:410 +#: g10/gpg.c:413 msgid "import/merge keys" msgstr "importere/flette nkler" -#: g10/gpg.c:413 +#: g10/gpg.c:416 msgid "print the card status" msgstr "vis kortets status" -#: g10/gpg.c:414 +#: g10/gpg.c:417 msgid "change data on a card" msgstr "endre data p et kort" -#: g10/gpg.c:415 +#: g10/gpg.c:418 msgid "change a card's PIN" msgstr "endre PIN p et kort" -#: g10/gpg.c:423 +#: g10/gpg.c:426 msgid "update the trust database" msgstr "oppdatere tillitsdatabasen" -#: g10/gpg.c:430 +#: g10/gpg.c:433 msgid "|algo [files]|print message digests" msgstr "|algo [filer]|skrive meldingsdigester" -#: g10/gpg.c:434 g10/gpgv.c:71 +#: g10/gpg.c:437 g10/gpgv.c:71 msgid "" "@\n" "Options:\n" @@ -1103,51 +1125,51 @@ msgstr "" "Valg:\n" " " -#: g10/gpg.c:436 +#: g10/gpg.c:439 msgid "create ascii armored output" msgstr "lage ASCII-beskyttet output" -#: g10/gpg.c:438 +#: g10/gpg.c:441 msgid "|NAME|encrypt for NAME" msgstr "|NAVN|kryptere for NAVN" -#: g10/gpg.c:449 +#: g10/gpg.c:452 msgid "use this user-id to sign or decrypt" msgstr "bruke denne brukeriden for signering eller dekryptering" -#: g10/gpg.c:450 +#: g10/gpg.c:453 msgid "|N|set compress level N (0 disables)" msgstr "|N|sette kompresjonsniv til N (0 slr av kompresjon)" -#: g10/gpg.c:455 +#: g10/gpg.c:458 msgid "use canonical text mode" msgstr "bruk kanonisk tekstmodus" -#: g10/gpg.c:469 +#: g10/gpg.c:472 msgid "use as output file" msgstr "bruk som outputfil" -#: g10/gpg.c:471 g10/gpgv.c:73 +#: g10/gpg.c:474 g10/gpgv.c:73 msgid "verbose" msgstr "fyldig output" -#: g10/gpg.c:482 +#: g10/gpg.c:485 msgid "do not make any changes" msgstr "ikke gjr noen endringer" -#: g10/gpg.c:483 +#: g10/gpg.c:486 msgid "prompt before overwriting" msgstr "spr fr overskriving" -#: g10/gpg.c:524 +#: g10/gpg.c:527 msgid "use strict OpenPGP behavior" msgstr "bruk streng OpenPGP-oppfrsel" -#: g10/gpg.c:525 +#: g10/gpg.c:528 msgid "generate PGP 2.x compatible messages" msgstr "generere PGP 2.x-kompatible meldinger" -#: g10/gpg.c:553 +#: g10/gpg.c:556 msgid "" "@\n" "(See the man page for a complete listing of all commands and options)\n" @@ -1155,7 +1177,7 @@ msgstr "" "@\n" "(Se mansiden for en komplett liste over alle kommandoene og valgene)\n" -#: g10/gpg.c:556 +#: g10/gpg.c:559 msgid "" "@\n" "Examples:\n" @@ -1175,15 +1197,15 @@ msgstr "" " --list-keys [navn] vise nkler\n" " --fingerprint [navn] vise fingeravtrykk\n" -#: g10/gpg.c:751 g10/gpgv.c:98 +#: g10/gpg.c:757 g10/gpgv.c:98 msgid "Please report bugs to .\n" msgstr "Vennligst rapporter feil til .\n" -#: g10/gpg.c:768 +#: g10/gpg.c:774 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Bruksmte: gpg [valg] [filer] (-h for hjelp)" -#: g10/gpg.c:771 +#: g10/gpg.c:777 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -1193,7 +1215,7 @@ msgstr "" "signere, sjekke, kryptere eller dekryptere\n" "standard operasjon avhenger av inputdata\n" -#: g10/gpg.c:782 +#: g10/gpg.c:788 msgid "" "\n" "Supported algorithms:\n" @@ -1201,561 +1223,571 @@ msgstr "" "\n" "Stttede algoritmer:\n" -#: g10/gpg.c:785 +#: g10/gpg.c:791 msgid "Pubkey: " msgstr "Offentlig nkkel: " -#: g10/gpg.c:791 g10/keyedit.c:2310 +#: g10/gpg.c:797 g10/keyedit.c:2310 msgid "Cipher: " msgstr "Cipher: " -#: g10/gpg.c:797 +#: g10/gpg.c:803 msgid "Hash: " msgstr "Hash: " -#: g10/gpg.c:803 g10/keyedit.c:2356 +#: g10/gpg.c:809 g10/keyedit.c:2356 msgid "Compression: " msgstr "Kompresjon: " -#: g10/gpg.c:886 +#: g10/gpg.c:892 msgid "usage: gpg [options] " msgstr "bruksmte: gpg [valg] " -#: g10/gpg.c:1034 +#: g10/gpg.c:1040 msgid "conflicting commands\n" msgstr "motstridende kommandoer\n" -#: g10/gpg.c:1052 +#: g10/gpg.c:1058 #, c-format msgid "no = sign found in group definition `%s'\n" msgstr "fant ingen =-tegn i gruppedefinisjonen %s\n" -#: g10/gpg.c:1249 +#: g10/gpg.c:1255 #, c-format msgid "WARNING: unsafe ownership on homedir `%s'\n" msgstr "ADVARSEL: utrygt eierskap p hjemmekatalogen %s\n" -#: g10/gpg.c:1252 +#: g10/gpg.c:1258 #, c-format msgid "WARNING: unsafe ownership on configuration file `%s'\n" msgstr "ADVARSEL: utrygt eierskap p konfigurasjonsfilen %s\n" -#: g10/gpg.c:1255 +#: g10/gpg.c:1261 #, c-format msgid "WARNING: unsafe ownership on extension `%s'\n" msgstr "ADVARSEL: utrygt eierskap p utvidelsen %s\n" -#: g10/gpg.c:1261 +#: g10/gpg.c:1267 #, c-format msgid "WARNING: unsafe permissions on homedir `%s'\n" msgstr "ADVARSEL: utrygge rettigheter p hjemmekatalogen %s\n" -#: g10/gpg.c:1264 +#: g10/gpg.c:1270 #, c-format msgid "WARNING: unsafe permissions on configuration file `%s'\n" msgstr "ADVARSEL: utrygge rettigheter p konfigurasjonsfilen %s\n" -#: g10/gpg.c:1267 +#: g10/gpg.c:1273 #, c-format msgid "WARNING: unsafe permissions on extension `%s'\n" msgstr "ADVARSEL: utrygge rettigheter p utvidelsen %s\n" -#: g10/gpg.c:1273 +#: g10/gpg.c:1279 #, c-format msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n" -msgstr "ADVARSEL: utrygt eierskap p katalogene p nivene over hjemmekatalogen %s\n" +msgstr "" +"ADVARSEL: utrygt eierskap p katalogene p nivene over hjemmekatalogen %" +"s\n" -#: g10/gpg.c:1276 +#: g10/gpg.c:1282 #, c-format msgid "" "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n" -msgstr "ADVARSEL: utrygt eierskap p katalogene p nivene over konfigurasjonsfilen %s\n" - -#: g10/gpg.c:1279 -#, c-format -msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" -msgstr "ADVARSEL: utrygt eierskap p katalogene p nivene over utvidelsen %s\n" +msgstr "" +"ADVARSEL: utrygt eierskap p katalogene p nivene over konfigurasjonsfilen " +"%s\n" #: g10/gpg.c:1285 #, c-format -msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" -msgstr "ADVARSEL: utrygge rettigheter p katalogene p nivene over hjemmekatalogen %s\n" - -#: g10/gpg.c:1288 -#, c-format -msgid "" -"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" -msgstr "ADVARSEL: utrygge rettigheter p katalogene p nivene over konfigurasjonsfilen %s\n" +msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n" +msgstr "" +"ADVARSEL: utrygt eierskap p katalogene p nivene over utvidelsen %s\n" #: g10/gpg.c:1291 #, c-format -msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" -msgstr "ADVARSEL: utrygge rettigheter p katalogene p nivene over utvidelsen %s\n" +msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n" +msgstr "" +"ADVARSEL: utrygge rettigheter p katalogene p nivene over hjemmekatalogen " +"%s\n" -#: g10/gpg.c:1432 +#: g10/gpg.c:1294 +#, c-format +msgid "" +"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n" +msgstr "" +"ADVARSEL: utrygge rettigheter p katalogene p nivene over " +"konfigurasjonsfilen %s\n" + +#: g10/gpg.c:1297 +#, c-format +msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n" +msgstr "" +"ADVARSEL: utrygge rettigheter p katalogene p nivene over utvidelsen %s\n" + +#: g10/gpg.c:1438 #, c-format msgid "unknown configuration item `%s'\n" msgstr "ukjent konfigurasjonspunkt %s\n" -#: g10/gpg.c:1525 +#: g10/gpg.c:1531 msgid "display photo IDs during key listings" msgstr "" -#: g10/gpg.c:1527 +#: g10/gpg.c:1533 msgid "show policy URLs during signature listings" msgstr "" -#: g10/gpg.c:1529 +#: g10/gpg.c:1535 msgid "show all notations during signature listings" msgstr "" -#: g10/gpg.c:1531 +#: g10/gpg.c:1537 msgid "show IETF standard notations during signature listings" msgstr "" -#: g10/gpg.c:1535 +#: g10/gpg.c:1541 msgid "show user-supplied notations during signature listings" msgstr "" -#: g10/gpg.c:1537 +#: g10/gpg.c:1543 msgid "show preferred keyserver URLs during signature listings" msgstr "" -#: g10/gpg.c:1539 +#: g10/gpg.c:1545 msgid "show user ID validity during key listings" msgstr "" -#: g10/gpg.c:1541 +#: g10/gpg.c:1547 msgid "show revoked and expired user IDs in key listings" msgstr "" -#: g10/gpg.c:1543 +#: g10/gpg.c:1549 msgid "show revoked and expired subkeys in key listings" msgstr "" -#: g10/gpg.c:1545 +#: g10/gpg.c:1551 msgid "show the keyring name in key listings" msgstr "vise navnet til nkkelknippene i nkkellister" -#: g10/gpg.c:1547 +#: g10/gpg.c:1553 msgid "show expiration dates during signature listings" msgstr "" -#: g10/gpg.c:1852 +#: g10/gpg.c:1920 #, c-format msgid "NOTE: old default options file `%s' ignored\n" msgstr "MERK: den gamle valgfila %s ble ignorert\n" -#: g10/gpg.c:1894 +#: g10/gpg.c:1962 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "MERK: ingen standard valgfil %s\n" -#: g10/gpg.c:1898 +#: g10/gpg.c:1966 #, c-format msgid "option file `%s': %s\n" msgstr "valgfil %s: %s\n" -#: g10/gpg.c:1905 +#: g10/gpg.c:1973 #, c-format msgid "reading options from `%s'\n" msgstr "leser valg fra %s\n" -#: g10/gpg.c:2120 g10/gpg.c:2721 g10/gpg.c:2740 +#: g10/gpg.c:2188 g10/gpg.c:2814 g10/gpg.c:2833 #, c-format msgid "NOTE: %s is not for normal use!\n" msgstr "MERK: %s er ikke for vanlig bruk!\n" -#: g10/gpg.c:2133 +#: g10/gpg.c:2201 #, c-format msgid "cipher extension `%s' not loaded due to unsafe permissions\n" msgstr "cipherutvidelse %s ble ikke lastet p grunn av utrygge rettigheter\n" # Tenk litt p denne du, Trond. -#: g10/gpg.c:2287 g10/gpg.c:2299 +#: g10/gpg.c:2364 g10/gpg.c:2376 #, c-format msgid "`%s' is not a valid signature expiration\n" msgstr "%s er ikke en gyldig signaturutgelse\n" -#: g10/gpg.c:2375 +#: g10/gpg.c:2452 #, c-format msgid "`%s' is not a valid character set\n" msgstr "%s er ikke et gyldig tegnsett\n" -#: g10/gpg.c:2399 g10/keyedit.c:4049 +#: g10/gpg.c:2476 g10/gpg.c:2663 g10/keyedit.c:4064 msgid "could not parse keyserver URL\n" msgstr "kunne ikke parse nkkelserverens URL\n" -#: g10/gpg.c:2411 +#: g10/gpg.c:2488 #, c-format msgid "%s:%d: invalid keyserver options\n" msgstr "%s:%d: ugyldige valg for nkkelserver\n" -#: g10/gpg.c:2414 +#: g10/gpg.c:2491 msgid "invalid keyserver options\n" msgstr "ugyldige valg for nkkelserver\n" -#: g10/gpg.c:2421 +#: g10/gpg.c:2498 #, c-format msgid "%s:%d: invalid import options\n" msgstr "%s:%d: ugyldige importvalg\n" -#: g10/gpg.c:2424 +#: g10/gpg.c:2501 msgid "invalid import options\n" msgstr "ugyldige importvalg\n" -#: g10/gpg.c:2431 +#: g10/gpg.c:2508 #, c-format msgid "%s:%d: invalid export options\n" msgstr "%s:%d: ugyldige eksportvalg\n" -#: g10/gpg.c:2434 +#: g10/gpg.c:2511 msgid "invalid export options\n" msgstr "ugyldige eksportvalg\n" -#: g10/gpg.c:2441 +#: g10/gpg.c:2518 #, c-format msgid "%s:%d: invalid list options\n" msgstr "%s:%d: ugyldige listevalg\n" -#: g10/gpg.c:2444 +#: g10/gpg.c:2521 msgid "invalid list options\n" msgstr "ugyldige listevalg\n" -#: g10/gpg.c:2452 +#: g10/gpg.c:2529 msgid "display photo IDs during signature verification" msgstr "" -#: g10/gpg.c:2454 +#: g10/gpg.c:2531 msgid "show policy URLs during signature verification" msgstr "" -#: g10/gpg.c:2456 +#: g10/gpg.c:2533 msgid "show all notations during signature verification" msgstr "" -#: g10/gpg.c:2458 +#: g10/gpg.c:2535 msgid "show IETF standard notations during signature verification" msgstr "" -#: g10/gpg.c:2462 +#: g10/gpg.c:2539 msgid "show user-supplied notations during signature verification" msgstr "" -#: g10/gpg.c:2464 +#: g10/gpg.c:2541 msgid "show preferred keyserver URLs during signature verification" msgstr "" -#: g10/gpg.c:2466 +#: g10/gpg.c:2543 msgid "show user ID validity during signature verification" msgstr "" -#: g10/gpg.c:2468 +#: g10/gpg.c:2545 msgid "show revoked and expired user IDs in signature verification" msgstr "" -#: g10/gpg.c:2470 +#: g10/gpg.c:2547 msgid "validate signatures with PKA data" msgstr "" -#: g10/gpg.c:2472 +#: g10/gpg.c:2549 msgid "elevate the trust of signatures with valid PKA data" msgstr "" -#: g10/gpg.c:2479 +#: g10/gpg.c:2556 #, c-format msgid "%s:%d: invalid verify options\n" msgstr "%s:%d: ugyldige valg for bekreftelse\n" -#: g10/gpg.c:2482 +#: g10/gpg.c:2559 msgid "invalid verify options\n" msgstr "ugyldige valg for bekreftelse\n" -#: g10/gpg.c:2489 +#: g10/gpg.c:2566 #, c-format msgid "unable to set exec-path to %s\n" msgstr "kunne ikke sette exec-path til %s\n" -#: g10/gpg.c:2639 +#: g10/gpg.c:2729 #, c-format msgid "%s:%d: invalid auto-key-locate list\n" msgstr "%s:%d: ugyldig auto-key-locate-liste\n" -#: g10/gpg.c:2642 +#: g10/gpg.c:2732 msgid "invalid auto-key-locate list\n" msgstr "" -#: g10/gpg.c:2710 +#: g10/gpg.c:2803 msgid "WARNING: program may create a core file!\n" msgstr "ADVARSEL: programmet kan opprette en corefil!\n" -#: g10/gpg.c:2714 +#: g10/gpg.c:2807 #, c-format msgid "WARNING: %s overrides %s\n" msgstr "ADVARSEL: %s overstyrere %s\n" -#: g10/gpg.c:2723 +#: g10/gpg.c:2816 #, c-format msgid "%s not allowed with %s!\n" msgstr "%s er ikke tillatt sammen med %s!\n" -#: g10/gpg.c:2726 +#: g10/gpg.c:2819 #, c-format msgid "%s makes no sense with %s!\n" msgstr "%s er ikke fornuftig med %s!\n" -#: g10/gpg.c:2733 +#: g10/gpg.c:2826 #, c-format msgid "NOTE: %s is not available in this version\n" msgstr "" -#: g10/gpg.c:2748 +#: g10/gpg.c:2841 #, c-format msgid "will not run with insecure memory due to %s\n" msgstr "" -#: g10/gpg.c:2762 +#: g10/gpg.c:2855 msgid "you can only make detached or clear signatures while in --pgp2 mode\n" msgstr "du kan bare lage adskilte eller klare signaturer i --pgp2-modus\n" -#: g10/gpg.c:2768 +#: g10/gpg.c:2861 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n" msgstr "du kan ikke signere og kryptere samtidig i --pgp2-modus\n" -#: g10/gpg.c:2774 +#: g10/gpg.c:2867 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n" msgstr "du m bruke filer (og ikke en pipe) nr --pgp2 er psltt\n" -#: g10/gpg.c:2787 +#: g10/gpg.c:2880 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n" msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n" -#: g10/gpg.c:2854 g10/gpg.c:2878 +#: g10/gpg.c:2947 g10/gpg.c:2971 msgid "selected cipher algorithm is invalid\n" msgstr "valgt krypteringsalgoritme er ugyldig\n" -#: g10/gpg.c:2860 g10/gpg.c:2884 +#: g10/gpg.c:2953 g10/gpg.c:2977 msgid "selected digest algorithm is invalid\n" msgstr "valg digestalgoritme er ugyldig\n" -#: g10/gpg.c:2866 +#: g10/gpg.c:2959 msgid "selected compression algorithm is invalid\n" msgstr "valgt kompresjonsalgoritme er ugyldig\n" -#: g10/gpg.c:2872 +#: g10/gpg.c:2965 msgid "selected certification digest algorithm is invalid\n" msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n" -#: g10/gpg.c:2887 +#: g10/gpg.c:2980 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed m vre strre enn 0\n" -#: g10/gpg.c:2889 +#: g10/gpg.c:2982 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-neede m vre strre enn 1\n" -#: g10/gpg.c:2891 +#: g10/gpg.c:2984 msgid "max-cert-depth must be in the range from 1 to 255\n" msgstr "max-cert-depth m vre i intervallet fra 1 til 255\n" -#: g10/gpg.c:2893 +#: g10/gpg.c:2986 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n" msgstr "ugyldig default-cert-level; m vre 0, 1, 2 eller 3\n" -#: g10/gpg.c:2895 +#: g10/gpg.c:2988 msgid "invalid min-cert-level; must be 1, 2, or 3\n" msgstr "ugyldig min-cert-level; m vre 0, 1, 2 eller 3\n" -#: g10/gpg.c:2898 +#: g10/gpg.c:2991 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "MERK: enkel S2K-modus (0) er sterkt frardet\n" -#: g10/gpg.c:2902 +#: g10/gpg.c:2995 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ugyldig S2K-modus; m vre 0, 1 eller 3\n" -#: g10/gpg.c:2909 +#: g10/gpg.c:3002 msgid "invalid default preferences\n" msgstr "ugyldig standard preferanser\n" -#: g10/gpg.c:2918 +#: g10/gpg.c:3011 msgid "invalid personal cipher preferences\n" msgstr "ugyldig personlig cipherpreferanser\n" -#: g10/gpg.c:2922 +#: g10/gpg.c:3015 msgid "invalid personal digest preferences\n" msgstr "ugyldig personlig digestpreferanser\n" -#: g10/gpg.c:2926 +#: g10/gpg.c:3019 msgid "invalid personal compress preferences\n" msgstr "ugyldig personlig kompresjonspreferanser\n" -#: g10/gpg.c:2959 +#: g10/gpg.c:3052 #, c-format msgid "%s does not yet work with %s\n" msgstr "%s virker ikke enn med %s\n" -#: g10/gpg.c:3006 +#: g10/gpg.c:3099 #, c-format msgid "you may not use cipher algorithm `%s' while in %s mode\n" msgstr "du kan ikke bruke cipheralgoritmen %s i %s-modus\n" -#: g10/gpg.c:3011 +#: g10/gpg.c:3104 #, c-format msgid "you may not use digest algorithm `%s' while in %s mode\n" msgstr "du kan ikke bruke digestalgoritmen %s i %s-modus\n" -#: g10/gpg.c:3016 +#: g10/gpg.c:3109 #, c-format msgid "you may not use compression algorithm `%s' while in %s mode\n" msgstr "du kan ikke bruke kompresjonsalgoritmen %s i %s-modus\n" -#: g10/gpg.c:3112 +#: g10/gpg.c:3208 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "klarte ikke initialisere tillitsdatabasen: %s\n" -#: g10/gpg.c:3123 +#: g10/gpg.c:3219 msgid "WARNING: recipients (-r) given without using public key encryption\n" msgstr "" "ADVARSEL: mottakere (-r) angitt uten bruke offentlig nkkelkryptering\n" -#: g10/gpg.c:3134 +#: g10/gpg.c:3230 msgid "--store [filename]" msgstr "--store [filnavn]" -#: g10/gpg.c:3141 +#: g10/gpg.c:3237 msgid "--symmetric [filename]" msgstr "--symmetric [filnavn]" -#: g10/gpg.c:3143 +#: g10/gpg.c:3239 #, c-format msgid "symmetric encryption of `%s' failed: %s\n" msgstr "symmetrisk kryptering av %s mislyktes: %s\n" -#: g10/gpg.c:3153 +#: g10/gpg.c:3249 msgid "--encrypt [filename]" msgstr "--encrypt [filnavn]" -#: g10/gpg.c:3166 +#: g10/gpg.c:3262 msgid "--symmetric --encrypt [filename]" msgstr "--symmetric --encrypt [filnavn]" -#: g10/gpg.c:3168 +#: g10/gpg.c:3264 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3171 +#: g10/gpg.c:3267 #, c-format msgid "you cannot use --symmetric --encrypt while in %s mode\n" msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n" -#: g10/gpg.c:3189 +#: g10/gpg.c:3285 msgid "--sign [filename]" msgstr "--sign [filnavn]" -#: g10/gpg.c:3202 +#: g10/gpg.c:3298 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [filnavn]" -#: g10/gpg.c:3217 +#: g10/gpg.c:3313 msgid "--symmetric --sign --encrypt [filename]" msgstr "--symmetric --sign --encrypt [filnavn]" -#: g10/gpg.c:3219 +#: g10/gpg.c:3315 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n" msgstr "" -#: g10/gpg.c:3222 +#: g10/gpg.c:3318 #, c-format msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n" msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n" -#: g10/gpg.c:3242 +#: g10/gpg.c:3338 msgid "--sign --symmetric [filename]" msgstr "--sign --symmetric [filnavn]" -#: g10/gpg.c:3251 +#: g10/gpg.c:3347 msgid "--clearsign [filename]" msgstr "--clearsign [filnavn]" -#: g10/gpg.c:3276 +#: g10/gpg.c:3372 msgid "--decrypt [filename]" msgstr "--decrypt [filnavn]" -#: g10/gpg.c:3284 +#: g10/gpg.c:3380 msgid "--sign-key user-id" msgstr "--sign-key brukerid" -#: g10/gpg.c:3288 +#: g10/gpg.c:3384 msgid "--lsign-key user-id" msgstr "--lsign-key brukerid" -#: g10/gpg.c:3309 +#: g10/gpg.c:3405 msgid "--edit-key user-id [commands]" msgstr "--edit-key brukerid [kommandoer]" -#: g10/gpg.c:3380 +#: g10/gpg.c:3476 msgid "-k[v][v][v][c] [user-id] [keyring]" msgstr "-k[v][v][v][c] [brukerid] [nkkelknippe]" -#: g10/gpg.c:3417 +#: g10/gpg.c:3518 #, c-format msgid "keyserver send failed: %s\n" msgstr "sending til nkkelserver mislyktes: %s\n" -#: g10/gpg.c:3419 +#: g10/gpg.c:3520 #, c-format msgid "keyserver receive failed: %s\n" msgstr "mottak fra nkkelserver mislyktes: %s\n" -#: g10/gpg.c:3421 +#: g10/gpg.c:3522 #, c-format msgid "key export failed: %s\n" msgstr "nkkeleksport mislyktes: %s\n" -#: g10/gpg.c:3432 +#: g10/gpg.c:3533 #, c-format msgid "keyserver search failed: %s\n" msgstr "sk p nkkelserver mislyktes: %s\n" -#: g10/gpg.c:3442 +#: g10/gpg.c:3543 #, c-format msgid "keyserver refresh failed: %s\n" msgstr "refresh p nkkelserver mislyktes: %s\n" -#: g10/gpg.c:3493 +#: g10/gpg.c:3594 #, c-format msgid "dearmoring failed: %s\n" msgstr "dearmoring failed: %s\n" -#: g10/gpg.c:3501 +#: g10/gpg.c:3602 #, c-format msgid "enarmoring failed: %s\n" msgstr "enarmoring failed: %s\n" -#: g10/gpg.c:3588 +#: g10/gpg.c:3689 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ugyldig hashalgoritme %s\n" -#: g10/gpg.c:3711 +#: g10/gpg.c:3812 msgid "[filename]" msgstr "[filnavn]" -#: g10/gpg.c:3715 +#: g10/gpg.c:3816 msgid "Go ahead and type your message ...\n" msgstr "Sett i gang og tast inn meldingen din ...\n" -#: g10/gpg.c:4016 +#: g10/gpg.c:4120 msgid "the given certification policy URL is invalid\n" msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n" -#: g10/gpg.c:4018 +#: g10/gpg.c:4122 msgid "the given signature policy URL is invalid\n" msgstr "den angitte URLen for signaturpolicy er ugyldig\n" -#: g10/gpg.c:4051 +#: g10/gpg.c:4155 msgid "the given preferred keyserver URL is invalid\n" msgstr "den angitte URLen for den foretrukkede nkkelserveren er ugyldig\n" @@ -1763,32 +1795,32 @@ msgstr "den angitte URLen for den foretrukkede n msgid "too many entries in pk cache - disabled\n" msgstr "for mange innslag i pk-cachen - utkoblet\n" -#: g10/getkey.c:188 g10/getkey.c:2889 +#: g10/getkey.c:175 msgid "[User ID not found]" msgstr "[Brukerid ikke funnet]" -#: g10/getkey.c:935 g10/getkey.c:945 g10/getkey.c:955 g10/getkey.c:971 -#: g10/getkey.c:986 +#: g10/getkey.c:948 g10/getkey.c:958 g10/getkey.c:968 g10/getkey.c:984 +#: g10/getkey.c:999 #, c-format msgid "automatically retrieved `%s' via %s\n" msgstr "" -#: g10/getkey.c:1813 +#: g10/getkey.c:1826 #, c-format msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n" msgstr "Ugyldig nkkel %s gjort gyldig av --allow-non-selfsigned-uid\n" -#: g10/getkey.c:2367 +#: g10/getkey.c:2380 g10/keyedit.c:3707 #, c-format msgid "no secret subkey for public subkey %s - ignoring\n" msgstr "ingen hemmelig undernkkel for offentlig undernkkel %s - ignorerer\n" -#: g10/getkey.c:2598 +#: g10/getkey.c:2611 #, c-format msgid "using subkey %s instead of primary key %s\n" msgstr "bruker undernkkel %s i stedet for primrnkkel %s\n" -#: g10/getkey.c:2645 +#: g10/getkey.c:2658 #, c-format msgid "key %s: secret key without public key - skipped\n" msgstr "nkkel %s: hemmelig nkkel uten offentlig nkkel - hoppet over\n" @@ -2196,327 +2228,334 @@ msgstr " oppryddete brukerider: %lu\n" #: g10/import.c:566 #, c-format -msgid "" -"WARNING: key %s contains preferences for unavailable\n" -"algorithms on these user IDs:\n" +msgid "WARNING: key %s contains preferences for unavailable\n" msgstr "" -#: g10/import.c:604 +#. TRANSLATORS: This string is belongs to the previous one. They are +#. only split up to allow printing of a common prefix. +#: g10/import.c:570 +#, fuzzy +msgid " algorithms on these user IDs:\n" +msgstr " nye brukerider: %lu\n" + +#: g10/import.c:607 #, c-format msgid " \"%s\": preference for cipher algorithm %s\n" msgstr "" -#: g10/import.c:616 +#: g10/import.c:619 #, c-format msgid " \"%s\": preference for digest algorithm %s\n" msgstr " %s preferanse for digestalgoritme %s\n" -#: g10/import.c:628 +#: g10/import.c:631 #, c-format msgid " \"%s\": preference for compression algorithm %s\n" msgstr "" -#: g10/import.c:641 +#: g10/import.c:644 msgid "it is strongly suggested that you update your preferences and\n" msgstr "" -#: g10/import.c:643 +#: g10/import.c:646 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n" msgstr "" -#: g10/import.c:667 +#: g10/import.c:670 #, c-format msgid "you can update your preferences with: gpg --edit-key %s updpref save\n" msgstr "" -#: g10/import.c:719 g10/import.c:1099 +#: g10/import.c:720 g10/import.c:1118 #, c-format msgid "key %s: no user ID\n" msgstr "nkkel %s: ingen brukerid\n" -#: g10/import.c:748 +#: g10/import.c:749 #, c-format msgid "key %s: PKS subkey corruption repaired\n" msgstr "nkkel %s: PKS-undernkkel reparert\n" -#: g10/import.c:763 +#: g10/import.c:764 #, c-format msgid "key %s: accepted non self-signed user ID \"%s\"\n" msgstr "nkkel %s: akseptert ikke-selvsignert brukerid %s\n" -#: g10/import.c:769 +#: g10/import.c:770 #, c-format msgid "key %s: no valid user IDs\n" msgstr "nkkel %s: ingen gyldig brukerid\n" -#: g10/import.c:771 +#: g10/import.c:772 msgid "this may be caused by a missing self-signature\n" msgstr "dette kan skyldes en manglende selvsignatur\n" -#: g10/import.c:781 g10/import.c:1221 +#: g10/import.c:782 g10/import.c:1240 #, c-format msgid "key %s: public key not found: %s\n" msgstr "nkkel %s: offentlig nkkel ikke funnet: %s\n" -#: g10/import.c:787 +#: g10/import.c:788 #, c-format msgid "key %s: new key - skipped\n" msgstr "nkkel %s: ny nkkel - hoppet over\n" -#: g10/import.c:796 +#: g10/import.c:797 #, c-format msgid "no writable keyring found: %s\n" msgstr "ingen skrivbart nkkelknippe funnet: %s\n" -#: g10/import.c:801 g10/openfile.c:267 g10/sign.c:802 g10/sign.c:1075 +#: g10/import.c:802 g10/openfile.c:267 g10/sign.c:831 g10/sign.c:1135 #, c-format msgid "writing to `%s'\n" msgstr "skriver til %s\n" -#: g10/import.c:805 g10/import.c:900 g10/import.c:1139 g10/import.c:1282 -#: g10/import.c:2344 g10/import.c:2366 +#: g10/import.c:806 g10/import.c:901 g10/import.c:1158 g10/import.c:1301 +#: g10/import.c:2363 g10/import.c:2385 #, c-format msgid "error writing keyring `%s': %s\n" msgstr "feil ved skriving av nkkelknippet %s: %s\n" -#: g10/import.c:824 +#: g10/import.c:825 #, c-format msgid "key %s: public key \"%s\" imported\n" msgstr "nkkel %s: offentlig nkkel %s importert\n" -#: g10/import.c:848 +#: g10/import.c:849 #, c-format msgid "key %s: doesn't match our copy\n" msgstr "nkkel %s: stemmer ikke med vr kopi\n" -#: g10/import.c:865 g10/import.c:1239 +#: g10/import.c:866 g10/import.c:1258 #, c-format msgid "key %s: can't locate original keyblock: %s\n" msgstr "nkkel %s: kan ikke finne original nkkelblokk: %s\n" -#: g10/import.c:873 g10/import.c:1246 +#: g10/import.c:874 g10/import.c:1265 #, c-format msgid "key %s: can't read original keyblock: %s\n" msgstr "nkkel %s: kan ikke lese original nkkelblokk: %s\n" -#: g10/import.c:910 +#: g10/import.c:911 #, c-format msgid "key %s: \"%s\" 1 new user ID\n" msgstr "nkkel %s: %s 1 ny brukerid\n" -#: g10/import.c:913 +#: g10/import.c:914 #, c-format msgid "key %s: \"%s\" %d new user IDs\n" msgstr "nkkel %s: %s %d nye brukerider\n" -#: g10/import.c:916 +#: g10/import.c:917 #, c-format msgid "key %s: \"%s\" 1 new signature\n" msgstr "nkkel %s: %s 1 ny signatur\n" -#: g10/import.c:919 +#: g10/import.c:920 #, c-format msgid "key %s: \"%s\" %d new signatures\n" msgstr "nkkel: %s: %s %d nye signaturer\n" -#: g10/import.c:922 +#: g10/import.c:923 #, c-format msgid "key %s: \"%s\" 1 new subkey\n" msgstr "nkkel %s: %s 1 ny undernkkel\n" -#: g10/import.c:925 +#: g10/import.c:926 #, c-format msgid "key %s: \"%s\" %d new subkeys\n" msgstr "nkkel %s: %s %d nye undernkler\n" -#: g10/import.c:928 +#: g10/import.c:929 #, c-format msgid "key %s: \"%s\" %d signature cleaned\n" msgstr "nkkel: %s: %s %d nye signaturer\n" -#: g10/import.c:931 +#: g10/import.c:932 #, c-format msgid "key %s: \"%s\" %d signatures cleaned\n" msgstr "nkkel: %s: %s %d nye signaturer\n" -#: g10/import.c:934 +#: g10/import.c:935 #, c-format msgid "key %s: \"%s\" %d user ID cleaned\n" msgstr "nkkel %s: %s %d nye brukerider\n" -#: g10/import.c:937 +#: g10/import.c:938 #, c-format msgid "key %s: \"%s\" %d user IDs cleaned\n" msgstr "nkkel %s: %s %d nye brukerider\n" -#: g10/import.c:960 +#: g10/import.c:961 #, c-format msgid "key %s: \"%s\" not changed\n" msgstr "nkkel %s: %s ikke endret\n" -#: g10/import.c:1105 +#: g10/import.c:1124 #, c-format msgid "key %s: secret key with invalid cipher %d - skipped\n" msgstr "nkkel %s: hemmelig nkkel med ugyldig cipher %d - hoppet over\n" -#: g10/import.c:1116 +#: g10/import.c:1135 msgid "importing secret keys not allowed\n" msgstr "import av hemmelig nkkel er ikke tillatt\n" -#: g10/import.c:1133 g10/import.c:2359 +#: g10/import.c:1152 g10/import.c:2378 #, c-format msgid "no default secret keyring: %s\n" msgstr "ingen standard hemmelig nkkelknippe: %s\n" -#: g10/import.c:1144 +#: g10/import.c:1163 #, c-format msgid "key %s: secret key imported\n" msgstr "nkkel %s: hemmelig nkkel importert\n" -#: g10/import.c:1174 +#: g10/import.c:1193 #, c-format msgid "key %s: already in secret keyring\n" msgstr "nkkel %s: finnes allerede i hemmelig nkkelknippe\n" -#: g10/import.c:1184 +#: g10/import.c:1203 #, c-format msgid "key %s: secret key not found: %s\n" msgstr "nkkel %s: hemmelig nkkel ikke funnet: %s\n" -#: g10/import.c:1214 +#: g10/import.c:1233 #, c-format msgid "key %s: no public key - can't apply revocation certificate\n" -msgstr "nkkel %s: ingen offentlig nkkel - kan ikke anvende opphevingssertifikat\n" +msgstr "" +"nkkel %s: ingen offentlig nkkel - kan ikke anvende opphevingssertifikat\n" -#: g10/import.c:1257 +#: g10/import.c:1276 #, c-format msgid "key %s: invalid revocation certificate: %s - rejected\n" msgstr "nkkel %s: ugyldig opphevingssertifikat: %s - avvist\n" -#: g10/import.c:1289 +#: g10/import.c:1308 #, c-format msgid "key %s: \"%s\" revocation certificate imported\n" msgstr "nkkel %s: %s opphevingssertifikat importert\n" -#: g10/import.c:1355 +#: g10/import.c:1374 #, c-format msgid "key %s: no user ID for signature\n" msgstr "nkkel %s: ingen brukerid for signatur\n" -#: g10/import.c:1370 +#: g10/import.c:1389 #, c-format msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n" msgstr "nkkel %s: ustttet offentlig nkkelalgoritme for brukerid %s\n" -#: g10/import.c:1372 +#: g10/import.c:1391 #, c-format msgid "key %s: invalid self-signature on user ID \"%s\"\n" msgstr "nkkel %s: ugyldig selvsignatur for brukerid %s\n" -#: g10/import.c:1390 +#: g10/import.c:1409 #, c-format msgid "key %s: no subkey for key binding\n" msgstr "nkkel %s: ingen undernkkel for nkkelbinding\n" -#: g10/import.c:1401 g10/import.c:1451 +#: g10/import.c:1420 g10/import.c:1470 #, c-format msgid "key %s: unsupported public key algorithm\n" msgstr "nkkel %s: ustttet offentlig nkkelalgoritme\n" -#: g10/import.c:1403 +#: g10/import.c:1422 #, c-format msgid "key %s: invalid subkey binding\n" msgstr "nkkel %s: ugyldig undernkkelbinding\n" -#: g10/import.c:1418 +#: g10/import.c:1437 #, c-format msgid "key %s: removed multiple subkey binding\n" msgstr "nkkel %s: fjernet flere undernkkelbindinger\n" -#: g10/import.c:1440 +#: g10/import.c:1459 #, c-format msgid "key %s: no subkey for key revocation\n" msgstr "nkkel %s: ingen undernkkel for nkkeloppheving\n" -#: g10/import.c:1453 +#: g10/import.c:1472 #, c-format msgid "key %s: invalid subkey revocation\n" msgstr "nkkel %s: ugyldig undernkkeloppheving\n" -#: g10/import.c:1468 +#: g10/import.c:1487 #, c-format msgid "key %s: removed multiple subkey revocation\n" msgstr "nkkel %s: fjernet flere undernkkelopphevinger\n" -#: g10/import.c:1510 +#: g10/import.c:1529 #, c-format msgid "key %s: skipped user ID \"%s\"\n" msgstr "nkkel %s: hoppet over brukerid %s\n" -#: g10/import.c:1531 +#: g10/import.c:1550 #, c-format msgid "key %s: skipped subkey\n" msgstr "nkkel %s: hoppet over undernkkel\n" -#: g10/import.c:1558 +#: g10/import.c:1577 #, c-format msgid "key %s: non exportable signature (class 0x%02X) - skipped\n" msgstr "nkkel %s: ikke-eksporterbar signatur (klasse 0x%02X) - hoppet over\n" -#: g10/import.c:1568 +#: g10/import.c:1587 #, c-format msgid "key %s: revocation certificate at wrong place - skipped\n" msgstr "nkkel %s: opphevingssertifikat p feil plass - hoppet over\n" -#: g10/import.c:1585 +#: g10/import.c:1604 #, c-format msgid "key %s: invalid revocation certificate: %s - skipped\n" msgstr "nkkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n" -#: g10/import.c:1599 +#: g10/import.c:1618 #, c-format msgid "key %s: subkey signature in wrong place - skipped\n" msgstr "nkkel %s: undernkkelsignatur p feil plass - hoppet over\n" -#: g10/import.c:1607 +#: g10/import.c:1626 #, c-format msgid "key %s: unexpected signature class (0x%02X) - skipped\n" msgstr "nkkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n" -#: g10/import.c:1707 +#: g10/import.c:1726 #, c-format msgid "key %s: duplicated user ID detected - merged\n" msgstr "nkkel %s: duplikert brukerid oppdaget - flettet sammen\n" -#: g10/import.c:1769 +#: g10/import.c:1788 #, c-format msgid "WARNING: key %s may be revoked: fetching revocation key %s\n" msgstr "ADVARSEL: nkkel %s kan vre opphevet: henter opphevingsnkkel %s\n" -#: g10/import.c:1783 +#: g10/import.c:1802 #, c-format msgid "WARNING: key %s may be revoked: revocation key %s not present.\n" -msgstr "ADVARSEL: nkkel %s kan vre opphevet: opphevingsnkkel %s ikke tilstede.\n" +msgstr "" +"ADVARSEL: nkkel %s kan vre opphevet: opphevingsnkkel %s ikke tilstede.\n" -#: g10/import.c:1842 +#: g10/import.c:1861 #, c-format msgid "key %s: \"%s\" revocation certificate added\n" msgstr "nkkel %s: %s opphevingssertifikat lagt til\n" -#: g10/import.c:1876 +#: g10/import.c:1895 #, c-format msgid "key %s: direct key signature added\n" msgstr "nkkel %s: direkte nkkelsignatur lagt til\n" -#: g10/import.c:2265 +#: g10/import.c:2284 msgid "NOTE: a key's S/N does not match the card's one\n" msgstr "" -#: g10/import.c:2273 +#: g10/import.c:2292 msgid "NOTE: primary key is online and stored on card\n" msgstr "" -#: g10/import.c:2275 +#: g10/import.c:2294 msgid "NOTE: secondary key is online and stored on card\n" msgstr "" @@ -2811,8 +2850,8 @@ msgstr "Jeg har sjekket denne n msgid "Really sign? (y/N) " msgstr "Virkelig signere? (j/N) " -#: g10/keyedit.c:1067 g10/keyedit.c:4768 g10/keyedit.c:4859 g10/keyedit.c:4923 -#: g10/keyedit.c:4984 g10/sign.c:362 +#: g10/keyedit.c:1067 g10/keyedit.c:4783 g10/keyedit.c:4874 g10/keyedit.c:4938 +#: g10/keyedit.c:4999 g10/sign.c:352 #, c-format msgid "signing failed: %s\n" msgstr "signering mislyktes: %s\n" @@ -2821,19 +2860,19 @@ msgstr "signering mislyktes: %s\n" msgid "Key has only stub or on-card key items - no passphrase to change.\n" msgstr "" -#: g10/keyedit.c:1143 g10/keygen.c:3136 +#: g10/keyedit.c:1143 g10/keygen.c:3199 msgid "This key is not protected.\n" msgstr "Denne nkkelen er ikke beskyttet.\n" -#: g10/keyedit.c:1147 g10/keygen.c:3124 g10/revoke.c:539 +#: g10/keyedit.c:1147 g10/keygen.c:3187 g10/revoke.c:539 msgid "Secret parts of primary key are not available.\n" msgstr "Hemmelige deler av primrnkkelen er ikke tilgjengelig.\n" -#: g10/keyedit.c:1151 g10/keygen.c:3139 +#: g10/keyedit.c:1151 g10/keygen.c:3202 msgid "Secret parts of primary key are stored on-card.\n" msgstr "Hemmelige deler av primrnkkelen er lagret p kort.\n" -#: g10/keyedit.c:1155 g10/keygen.c:3143 +#: g10/keyedit.c:1155 g10/keygen.c:3206 msgid "Key is protected.\n" msgstr "Nkkelen er beskyttet.\n" @@ -2848,7 +2887,7 @@ msgid "" "\n" msgstr "Tast inn den nye passfrasen for denne hemmelige nkklen.\n" -#: g10/keyedit.c:1194 g10/keygen.c:1855 +#: g10/keyedit.c:1194 g10/keygen.c:1897 msgid "passphrase not correctly repeated; try again" msgstr "passfrasen ble ikke gjentatt korrekt; prv igjen" @@ -3213,12 +3252,12 @@ msgid "(sensitive)" msgstr "(sensitiv)" #: g10/keyedit.c:2732 g10/keyedit.c:2788 g10/keyedit.c:2849 g10/keyedit.c:2864 -#: g10/keylist.c:194 g10/keyserver.c:526 +#: g10/keylist.c:194 g10/keyserver.c:511 #, c-format msgid "created: %s" msgstr "opprettet: %s" -#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:962 +#: g10/keyedit.c:2735 g10/keylist.c:771 g10/keylist.c:865 g10/mainproc.c:964 #, c-format msgid "revoked: %s" msgstr "opphevet: %s" @@ -3230,7 +3269,7 @@ msgstr "utgikk: %s" #: g10/keyedit.c:2739 g10/keyedit.c:2790 g10/keyedit.c:2851 g10/keyedit.c:2866 #: g10/keylist.c:196 g10/keylist.c:748 g10/keylist.c:783 g10/keylist.c:877 -#: g10/keylist.c:898 g10/keyserver.c:532 g10/mainproc.c:968 +#: g10/keylist.c:898 g10/keyserver.c:517 g10/mainproc.c:970 #, c-format msgid "expires: %s" msgstr "utgr: %s" @@ -3264,13 +3303,13 @@ msgid "" "unless you restart the program.\n" msgstr "" -#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:536 -#: g10/mainproc.c:1770 g10/trustdb.c:1179 g10/trustdb.c:1699 +#: g10/keyedit.c:2883 g10/keyedit.c:3229 g10/keyserver.c:521 +#: g10/mainproc.c:1772 g10/trustdb.c:1179 g10/trustdb.c:1699 msgid "revoked" msgstr "opphevet" -#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:540 -#: g10/mainproc.c:1772 g10/trustdb.c:532 g10/trustdb.c:1701 +#: g10/keyedit.c:2885 g10/keyedit.c:3231 g10/keyserver.c:525 +#: g10/mainproc.c:1774 g10/trustdb.c:532 g10/trustdb.c:1701 msgid "expired" msgstr "utgtt" @@ -3368,7 +3407,9 @@ msgstr "" #: g10/keyedit.c:3459 msgid "" "Are you sure you want to appoint this key as a designated revoker? (y/N) " -msgstr "Er du fortsatt sikker p at du vil gjre denne nkkelen til en opphever? (j/N) " +msgstr "" +"Er du fortsatt sikker p at du vil gjre denne nkkelen til en opphever? (j/" +"N) " #: g10/keyedit.c:3520 msgid "Please remove selections from the secret keys.\n" @@ -3394,185 +3435,196 @@ msgstr "" msgid "No corresponding signature in secret ring\n" msgstr "" -#: g10/keyedit.c:3821 +#: g10/keyedit.c:3668 +#, fuzzy, c-format +msgid "signing subkey %s is already cross-certified\n" +msgstr "Undernkkel %s er allerede opphevet.\n" + +#: g10/keyedit.c:3674 +#, c-format +msgid "subkey %s does not sign and so does not need to be cross-certified\n" +msgstr "" + +#: g10/keyedit.c:3836 msgid "Please select exactly one user ID.\n" msgstr "" -#: g10/keyedit.c:3860 g10/keyedit.c:3970 g10/keyedit.c:4090 g10/keyedit.c:4231 +#: g10/keyedit.c:3875 g10/keyedit.c:3985 g10/keyedit.c:4105 g10/keyedit.c:4246 #, c-format msgid "skipping v3 self-signature on user ID \"%s\"\n" msgstr "hopper over v3 selvsignatur for brukerid %s\n" -#: g10/keyedit.c:4031 +#: g10/keyedit.c:4046 msgid "Enter your preferred keyserver URL: " msgstr "" -#: g10/keyedit.c:4111 +#: g10/keyedit.c:4126 msgid "Are you sure you want to replace it? (y/N) " msgstr "Er du sikker p at du vil erstatte den? (j/N) " -#: g10/keyedit.c:4112 +#: g10/keyedit.c:4127 msgid "Are you sure you want to delete it? (y/N) " msgstr "Er du sikker p at du vil slette den? (j/N) " -#: g10/keyedit.c:4174 +#: g10/keyedit.c:4189 msgid "Enter the notation: " msgstr "" -#: g10/keyedit.c:4323 +#: g10/keyedit.c:4338 msgid "Proceed? (y/N) " msgstr "" -#: g10/keyedit.c:4387 +#: g10/keyedit.c:4402 #, c-format msgid "No user ID with index %d\n" msgstr "" -#: g10/keyedit.c:4445 +#: g10/keyedit.c:4460 #, c-format msgid "No user ID with hash %s\n" msgstr "" -#: g10/keyedit.c:4472 +#: g10/keyedit.c:4487 #, c-format msgid "No subkey with index %d\n" msgstr "" -#: g10/keyedit.c:4607 +#: g10/keyedit.c:4622 #, c-format msgid "user ID: \"%s\"\n" msgstr "" -#: g10/keyedit.c:4610 g10/keyedit.c:4674 g10/keyedit.c:4717 +#: g10/keyedit.c:4625 g10/keyedit.c:4689 g10/keyedit.c:4732 #, c-format msgid "signed by your key %s on %s%s%s\n" msgstr "" -#: g10/keyedit.c:4612 g10/keyedit.c:4676 g10/keyedit.c:4719 +#: g10/keyedit.c:4627 g10/keyedit.c:4691 g10/keyedit.c:4734 msgid " (non-exportable)" msgstr " (ikke-eksporterbar)" -#: g10/keyedit.c:4616 +#: g10/keyedit.c:4631 #, c-format msgid "This signature expired on %s.\n" msgstr "Denne signaturen utgikk den %s.\n" -#: g10/keyedit.c:4620 +#: g10/keyedit.c:4635 msgid "Are you sure you still want to revoke it? (y/N) " msgstr "" -#: g10/keyedit.c:4624 +#: g10/keyedit.c:4639 msgid "Create a revocation certificate for this signature? (y/N) " msgstr "" -#: g10/keyedit.c:4651 +#: g10/keyedit.c:4666 #, c-format msgid "You have signed these user IDs on key %s:\n" msgstr "" -#: g10/keyedit.c:4677 +#: g10/keyedit.c:4692 msgid " (non-revocable)" msgstr " (ikke-opphevbar)" -#: g10/keyedit.c:4684 +#: g10/keyedit.c:4699 #, c-format msgid "revoked by your key %s on %s\n" msgstr "" -#: g10/keyedit.c:4706 +#: g10/keyedit.c:4721 msgid "You are about to revoke these signatures:\n" msgstr "" -#: g10/keyedit.c:4726 +#: g10/keyedit.c:4741 msgid "Really create the revocation certificates? (y/N) " msgstr "" -#: g10/keyedit.c:4756 +#: g10/keyedit.c:4771 msgid "no secret key\n" msgstr "ingen hemmelig nkkel\n" -#: g10/keyedit.c:4826 +#: g10/keyedit.c:4841 #, c-format msgid "user ID \"%s\" is already revoked\n" msgstr "brukerid %s er allerede opphevet\n" -#: g10/keyedit.c:4843 +#: g10/keyedit.c:4858 #, c-format msgid "WARNING: a user ID signature is dated %d seconds in the future\n" msgstr "ADVARSEL: en brukeridsignatur er datert %d sekunder i fremtiden\n" -#: g10/keyedit.c:4907 +#: g10/keyedit.c:4922 #, c-format msgid "Key %s is already revoked.\n" msgstr "Nkkelen %s er allerede opphevet.\n" -#: g10/keyedit.c:4969 +#: g10/keyedit.c:4984 #, c-format msgid "Subkey %s is already revoked.\n" msgstr "Undernkkel %s er allerede opphevet.\n" -#: g10/keyedit.c:5064 +#: g10/keyedit.c:5079 #, c-format msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n" msgstr "" -#: g10/keygen.c:259 +#: g10/keygen.c:262 #, c-format msgid "preference `%s' duplicated\n" msgstr "preferansen %s er duplisert\n" -#: g10/keygen.c:266 +#: g10/keygen.c:269 msgid "too many cipher preferences\n" msgstr "for mange cipher-preferanser\n" -#: g10/keygen.c:268 +#: g10/keygen.c:271 msgid "too many digest preferences\n" msgstr "for mange digest-preferanser\n" -#: g10/keygen.c:270 +#: g10/keygen.c:273 msgid "too many compression preferences\n" msgstr "for mange kompresjons-preferanser\n" -#: g10/keygen.c:395 +#: g10/keygen.c:398 #, c-format msgid "invalid item `%s' in preference string\n" msgstr "ugyldig oppfring %s i preferansestreng\n" -#: g10/keygen.c:864 +#: g10/keygen.c:872 msgid "writing direct signature\n" msgstr "skriver direkte signatur\n" -#: g10/keygen.c:903 +#: g10/keygen.c:911 msgid "writing self signature\n" msgstr "skriver selvsignatur\n" -#: g10/keygen.c:954 +#: g10/keygen.c:961 msgid "writing key binding signature\n" msgstr "skriver nkkelbindende signatur\n" -#: g10/keygen.c:1015 g10/keygen.c:1095 g10/keygen.c:1183 g10/keygen.c:2700 +#: g10/keygen.c:1022 g10/keygen.c:1104 g10/keygen.c:1109 g10/keygen.c:1225 +#: g10/keygen.c:2762 #, c-format msgid "keysize invalid; using %u bits\n" msgstr "nkkelstrrelsen er ugyldig; bruker %u bits\n" -#: g10/keygen.c:1020 g10/keygen.c:1100 g10/keygen.c:1188 g10/keygen.c:2706 +#: g10/keygen.c:1027 g10/keygen.c:1115 g10/keygen.c:1230 g10/keygen.c:2768 #, c-format msgid "keysize rounded up to %u bits\n" msgstr "nkkelstrrelsen ble rundet opp til %u bits\n" -#: g10/keygen.c:1281 +#: g10/keygen.c:1323 msgid "Sign" msgstr "Signere" -#: g10/keygen.c:1284 +#: g10/keygen.c:1326 msgid "Certify" msgstr "Bekrefte" -#: g10/keygen.c:1287 +#: g10/keygen.c:1329 msgid "Encrypt" msgstr "Kryptere data" -#: g10/keygen.c:1290 +#: g10/keygen.c:1332 msgid "Authenticate" msgstr "Autentisere" @@ -3580,109 +3632,109 @@ msgstr "Autentisere" # K og k for kryptering # A og a for autentisering # Q og q for avslutte -#: g10/keygen.c:1298 +#: g10/keygen.c:1340 msgid "SsEeAaQq" msgstr "SsKkAaQq" -#: g10/keygen.c:1317 +#: g10/keygen.c:1359 #, c-format msgid "Possible actions for a %s key: " msgstr "" -#: g10/keygen.c:1321 +#: g10/keygen.c:1363 msgid "Current allowed actions: " msgstr "" -#: g10/keygen.c:1326 +#: g10/keygen.c:1368 #, c-format msgid " (%c) Toggle the sign capability\n" msgstr "" -#: g10/keygen.c:1329 +#: g10/keygen.c:1371 #, c-format msgid " (%c) Toggle the encrypt capability\n" msgstr "" -#: g10/keygen.c:1332 +#: g10/keygen.c:1374 #, c-format msgid " (%c) Toggle the authenticate capability\n" msgstr "" -#: g10/keygen.c:1335 +#: g10/keygen.c:1377 #, c-format msgid " (%c) Finished\n" msgstr "" -#: g10/keygen.c:1391 +#: g10/keygen.c:1433 msgid "Please select what kind of key you want:\n" msgstr "Vennligst velg hvilken type nkkel du vil ha:\n" -#: g10/keygen.c:1393 +#: g10/keygen.c:1435 #, c-format msgid " (%d) DSA and Elgamal (default)\n" msgstr " (%d) DSA og ElGamal (standard)\n" -#: g10/keygen.c:1394 +#: g10/keygen.c:1436 #, c-format msgid " (%d) DSA (sign only)\n" msgstr " (%d) DSA (bare signering)\n" -#: g10/keygen.c:1396 +#: g10/keygen.c:1438 #, c-format msgid " (%d) DSA (set your own capabilities)\n" msgstr " (%d) DSA (sette dine egne muligheter)\n" -#: g10/keygen.c:1398 +#: g10/keygen.c:1440 #, c-format msgid " (%d) Elgamal (encrypt only)\n" msgstr " (%d) ElGamal (bare kryptering)\n" -#: g10/keygen.c:1399 +#: g10/keygen.c:1441 #, c-format msgid " (%d) RSA (sign only)\n" msgstr " (%d) RSA (bare signering)\n" -#: g10/keygen.c:1401 +#: g10/keygen.c:1443 #, c-format msgid " (%d) RSA (encrypt only)\n" msgstr " (%d) RSA (bare kryptering)\n" -#: g10/keygen.c:1403 +#: g10/keygen.c:1445 #, c-format msgid " (%d) RSA (set your own capabilities)\n" msgstr " (%d) RSA (sette dine egne muligheter)\n" -#: g10/keygen.c:1472 g10/keygen.c:2577 +#: g10/keygen.c:1514 #, c-format msgid "DSA keypair will have %u bits.\n" msgstr "DSA-nkkelpar vil ha %u bits.\n" -#: g10/keygen.c:1482 +#: g10/keygen.c:1524 #, c-format msgid "%s keys may be between %u and %u bits long.\n" msgstr "" -#: g10/keygen.c:1489 +#: g10/keygen.c:1531 #, c-format msgid "What keysize do you want? (%u) " msgstr "Hvilken nkkelstrrelse vil du ha? (%u) " -#: g10/keygen.c:1503 +#: g10/keygen.c:1545 #, c-format msgid "%s keysizes must be in the range %u-%u\n" msgstr "" -#: g10/keygen.c:1509 +#: g10/keygen.c:1551 #, c-format msgid "Requested keysize is %u bits\n" msgstr "nsket nkkelstrrelse er %u bits\n" -#: g10/keygen.c:1514 g10/keygen.c:1519 +#: g10/keygen.c:1556 g10/keygen.c:1561 #, c-format msgid "rounded up to %u bits\n" msgstr "rundet opp til %u bits\n" -#: g10/keygen.c:1568 +#: g10/keygen.c:1610 msgid "" "Please specify how long the key should be valid.\n" " 0 = key does not expire\n" @@ -3698,7 +3750,7 @@ msgstr "" " m = nkkelen utgr om n months\n" " y = nkkelen utgr om n years\n" -#: g10/keygen.c:1579 +#: g10/keygen.c:1621 msgid "" "Please specify how long the signature should be valid.\n" " 0 = signature does not expire\n" @@ -3714,38 +3766,38 @@ msgstr "" " m = signaturen utgr om n months\n" " y = signaturen utgr om n years\n" -#: g10/keygen.c:1602 +#: g10/keygen.c:1644 msgid "Key is valid for? (0) " msgstr "Nkkelen er gyldig for? (0) " -#: g10/keygen.c:1607 +#: g10/keygen.c:1649 #, c-format msgid "Signature is valid for? (%s) " msgstr "Signaturen er gyldig for? (%s) " -#: g10/keygen.c:1625 +#: g10/keygen.c:1667 msgid "invalid value\n" msgstr "ugyldig verdi\n" -#: g10/keygen.c:1632 +#: g10/keygen.c:1674 msgid "Key does not expire at all\n" msgstr "Nkkel utgr ikke i det hele tatt\n" -#: g10/keygen.c:1633 +#: g10/keygen.c:1675 msgid "Signature does not expire at all\n" msgstr "Signaturen utgr ikke i det hele tatt\n" -#: g10/keygen.c:1638 +#: g10/keygen.c:1680 #, c-format msgid "Key expires at %s\n" msgstr "Nkkel utgr den %s\n" -#: g10/keygen.c:1639 +#: g10/keygen.c:1681 #, c-format msgid "Signature expires at %s\n" msgstr "Signaturen utgr den %s\n" -#: g10/keygen.c:1645 +#: g10/keygen.c:1687 msgid "" "Your system can't display dates beyond 2038.\n" "However, it will be correctly handled up to 2106.\n" @@ -3753,11 +3805,11 @@ msgstr "" "Systemet ditt kan ikke vise datoer etter 2038.\n" "Likevel vil det bli hndtert korrekt opp til 2106.\n" -#: g10/keygen.c:1650 +#: g10/keygen.c:1692 msgid "Is this correct? (y/N) " msgstr "Er dette korrekt (j/N)? " -#: g10/keygen.c:1673 +#: g10/keygen.c:1715 msgid "" "\n" "You need a user ID to identify your key; the software constructs the user " @@ -3773,44 +3825,44 @@ msgstr "" " Heinrich Heine (Der Dichter) \n" "\n" -#: g10/keygen.c:1686 +#: g10/keygen.c:1728 msgid "Real name: " msgstr "Fullt navn: " -#: g10/keygen.c:1694 +#: g10/keygen.c:1736 msgid "Invalid character in name\n" msgstr "Ugyldig tegn i navn\n" -#: g10/keygen.c:1696 +#: g10/keygen.c:1738 msgid "Name may not start with a digit\n" msgstr "Navnet kan ikke starte med et siffer\n" -#: g10/keygen.c:1698 +#: g10/keygen.c:1740 msgid "Name must be at least 5 characters long\n" msgstr "Navnet m vre minst 5 tegn langt\n" -#: g10/keygen.c:1706 +#: g10/keygen.c:1748 msgid "Email address: " msgstr "Epostadresse: " -#: g10/keygen.c:1712 +#: g10/keygen.c:1754 msgid "Not a valid email address\n" msgstr "Ikke en gyldig epostadresse\n" -#: g10/keygen.c:1720 +#: g10/keygen.c:1762 msgid "Comment: " msgstr "Kommentar: " -#: g10/keygen.c:1726 +#: g10/keygen.c:1768 msgid "Invalid character in comment\n" msgstr "Ugyldig tegn i kommentar\n" -#: g10/keygen.c:1749 +#: g10/keygen.c:1791 #, c-format msgid "You are using the `%s' character set.\n" msgstr "Du bruker tegnsettet %s.\n" -#: g10/keygen.c:1755 +#: g10/keygen.c:1797 #, c-format msgid "" "You selected this USER-ID:\n" @@ -3821,7 +3873,7 @@ msgstr "" " %s\n" "\n" -#: g10/keygen.c:1760 +#: g10/keygen.c:1802 msgid "Please don't put the email address into the real name or the comment\n" msgstr "" "Vennligst ikke putt epostadressen inn i fullt navn eller i kommentaren\n" @@ -3837,23 +3889,23 @@ msgstr "" #. o = Okay (ready, continue) #. q = Quit #. -#: g10/keygen.c:1776 +#: g10/keygen.c:1818 msgid "NnCcEeOoQq" msgstr "NnKeEeRrAa" -#: g10/keygen.c:1786 +#: g10/keygen.c:1828 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? " msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (A)vslutt? " -#: g10/keygen.c:1787 +#: g10/keygen.c:1829 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? " msgstr "Endre (N)avn, (K)ommentar, (E)postadresse eller (R)iktig/(A)vslutt? " -#: g10/keygen.c:1806 +#: g10/keygen.c:1848 msgid "Please correct the error first\n" msgstr "Vennligst korriger feilen frst\n" -#: g10/keygen.c:1846 +#: g10/keygen.c:1888 msgid "" "You need a Passphrase to protect your secret key.\n" "\n" @@ -3861,12 +3913,12 @@ msgstr "" "Du trenger en passfrase for beskytte din hemmelige nkkel.\n" "\n" -#: g10/keygen.c:1856 g10/passphrase.c:810 +#: g10/keygen.c:1898 g10/passphrase.c:810 #, c-format msgid "%s.\n" msgstr "%s.\n" -#: g10/keygen.c:1862 +#: g10/keygen.c:1904 msgid "" "You don't want a passphrase - this is probably a *bad* idea!\n" "I will do it anyway. You can change your passphrase at any time,\n" @@ -3878,7 +3930,7 @@ msgstr "" "hjelp av dette programmet og valget --edit-key.\n" "\n" -#: g10/keygen.c:1884 +#: g10/keygen.c:1926 msgid "" "We need to generate a lot of random bytes. It is a good idea to perform\n" "some other action (type on the keyboard, move the mouse, utilize the\n" @@ -3890,50 +3942,50 @@ msgstr "" "diskene jobbe) under primtallgenereringen; dette gir\n" "tilfeldig-tall-generatoren en bedre sjanse til samle nok entropy.\n" -#: g10/keygen.c:2646 +#: g10/keygen.c:2708 msgid "Key generation canceled.\n" msgstr "Nkkelgenereringen ble avbrutt.\n" -#: g10/keygen.c:2845 g10/keygen.c:2989 +#: g10/keygen.c:2907 g10/keygen.c:3052 #, c-format msgid "writing public key to `%s'\n" msgstr "skriver offentlig nkkel til %s\n" -#: g10/keygen.c:2847 g10/keygen.c:2992 +#: g10/keygen.c:2909 g10/keygen.c:3055 #, c-format msgid "writing secret key stub to `%s'\n" msgstr "skriver forelpig hemmelig nkkel til %s\n" -#: g10/keygen.c:2850 g10/keygen.c:2995 +#: g10/keygen.c:2912 g10/keygen.c:3058 #, c-format msgid "writing secret key to `%s'\n" msgstr "skriver hemmelig nkkel til %s\n" -#: g10/keygen.c:2978 +#: g10/keygen.c:3041 #, c-format msgid "no writable public keyring found: %s\n" msgstr "ingen skrivbart offentlig nkkelknippe ble funnet: %s\n" -#: g10/keygen.c:2984 +#: g10/keygen.c:3047 #, c-format msgid "no writable secret keyring found: %s\n" msgstr "ingen skrivbart hemmelig nkkelknippe ble funnet: %s\n" -#: g10/keygen.c:3002 +#: g10/keygen.c:3065 #, c-format msgid "error writing public keyring `%s': %s\n" msgstr "feil ved skriving av offentlig nkkelknippe %s: %s\n" -#: g10/keygen.c:3009 +#: g10/keygen.c:3072 #, c-format msgid "error writing secret keyring `%s': %s\n" msgstr "feil ved skriving av hemmelig nkkelknippe %s: %s\n" -#: g10/keygen.c:3032 +#: g10/keygen.c:3095 msgid "public and secret key created and signed.\n" msgstr "offentlig og hemmelig nkkel opprettet og signert.\n" -#: g10/keygen.c:3043 +#: g10/keygen.c:3106 msgid "" "Note that this key cannot be used for encryption. You may want to use\n" "the command \"--edit-key\" to generate a subkey for this purpose.\n" @@ -3942,13 +3994,13 @@ msgstr "" "kanskje bruke kommandoen --edit-key for generere en\n" "sekundrnkkel for dette formlet.\n" -#: g10/keygen.c:3055 g10/keygen.c:3184 g10/keygen.c:3299 +#: g10/keygen.c:3118 g10/keygen.c:3247 g10/keygen.c:3363 #, c-format msgid "Key generation failed: %s\n" msgstr "Nkkelgenerering mislyktes: %s\n" # Er dette entallsformen av denne strengen? -#: g10/keygen.c:3107 g10/keygen.c:3235 g10/sign.c:276 +#: g10/keygen.c:3170 g10/keygen.c:3298 g10/sign.c:276 #, c-format msgid "" "key has been created %lu second in future (time warp or clock problem)\n" @@ -3957,7 +4009,7 @@ msgstr "" "klokkeproblem)\n" # Er dette flertallsformen av denne og den forrige strengen? -#: g10/keygen.c:3109 g10/keygen.c:3237 g10/sign.c:278 +#: g10/keygen.c:3172 g10/keygen.c:3300 g10/sign.c:278 #, c-format msgid "" "key has been created %lu seconds in future (time warp or clock problem)\n" @@ -3965,27 +4017,27 @@ msgstr "" "nkkel har blitt opprettet %lu sekunder i fremtiden (time warp eller " "klokkeproblem)\n" -#: g10/keygen.c:3118 g10/keygen.c:3248 +#: g10/keygen.c:3181 g10/keygen.c:3311 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n" msgstr "" "MERK: opprettelse av undernkler for v3-nkler er ikke i samsvar med " "OpenPGP\n" -#: g10/keygen.c:3157 g10/keygen.c:3281 +#: g10/keygen.c:3220 g10/keygen.c:3344 msgid "Really create? (y/N) " msgstr "Virkelig opprette? (j/N)" -#: g10/keygen.c:3440 +#: g10/keygen.c:3509 #, c-format msgid "storing key onto card failed: %s\n" msgstr "lagring av nkkel p kort mislyktes: %s\n" -#: g10/keygen.c:3487 +#: g10/keygen.c:3556 #, c-format msgid "can't create backup file `%s': %s\n" msgstr "kan ikke opprette sikkerhetskopifil %s: %s\n" -#: g10/keygen.c:3513 +#: g10/keygen.c:3582 #, c-format msgid "NOTE: backup of card key saved to `%s'\n" msgstr "" @@ -4087,176 +4139,177 @@ msgstr "%lu n msgid "%s: keyring created\n" msgstr "" -#: g10/keyserver.c:76 +#: g10/keyserver.c:61 msgid "include revoked keys in search results" msgstr "" -#: g10/keyserver.c:77 +#: g10/keyserver.c:62 msgid "include subkeys when searching by key ID" msgstr "" -#: g10/keyserver.c:79 +#: g10/keyserver.c:64 msgid "use temporary files to pass data to keyserver helpers" msgstr "" -#: g10/keyserver.c:81 +#: g10/keyserver.c:66 msgid "do not delete temporary files after using them" msgstr "" -#: g10/keyserver.c:85 +#: g10/keyserver.c:70 msgid "automatically retrieve keys when verifying signatures" msgstr "" -#: g10/keyserver.c:87 +#: g10/keyserver.c:72 msgid "honor the preferred keyserver URL set on the key" msgstr "" -#: g10/keyserver.c:89 +#: g10/keyserver.c:74 msgid "honor the PKA record set on a key when retrieving keys" msgstr "" -#: g10/keyserver.c:155 +#: g10/keyserver.c:140 #, c-format msgid "WARNING: keyserver option `%s' is not used on this platform\n" -msgstr "ADVARSEL: nkkelserver-valget %s er ikke i bruk p denne plattformen\n" +msgstr "" +"ADVARSEL: nkkelserver-valget %s er ikke i bruk p denne plattformen\n" -#: g10/keyserver.c:538 +#: g10/keyserver.c:523 msgid "disabled" msgstr "utkoblet" -#: g10/keyserver.c:739 +#: g10/keyserver.c:724 msgid "Enter number(s), N)ext, or Q)uit > " msgstr "" -#: g10/keyserver.c:823 g10/keyserver.c:1425 +#: g10/keyserver.c:808 g10/keyserver.c:1421 #, c-format msgid "invalid keyserver protocol (us %d!=handler %d)\n" msgstr "" -#: g10/keyserver.c:921 +#: g10/keyserver.c:906 #, c-format msgid "key \"%s\" not found on keyserver\n" msgstr "nkkelen %s ble ikke funnet p nkkelserveren\n" -#: g10/keyserver.c:923 +#: g10/keyserver.c:908 msgid "key not found on keyserver\n" msgstr "nkkelen ble ikke funnet p nkkelserver\n" -#: g10/keyserver.c:1149 +#: g10/keyserver.c:1145 #, c-format msgid "requesting key %s from %s server %s\n" msgstr "ber om nkkelen %s fra %s server %s\n" -#: g10/keyserver.c:1153 +#: g10/keyserver.c:1149 #, c-format msgid "requesting key %s from %s\n" msgstr "ber om nkkel %s fra %s\n" -#: g10/keyserver.c:1177 +#: g10/keyserver.c:1173 #, c-format msgid "searching for names from %s server %s\n" msgstr "ske etter navn fra %s server %s\n" -#: g10/keyserver.c:1180 +#: g10/keyserver.c:1176 #, c-format msgid "searching for names from %s\n" msgstr "sker etter navn fra %s\n" -#: g10/keyserver.c:1328 +#: g10/keyserver.c:1324 #, c-format msgid "sending key %s to %s server %s\n" msgstr "" -#: g10/keyserver.c:1332 +#: g10/keyserver.c:1328 #, c-format msgid "sending key %s to %s\n" msgstr "" -#: g10/keyserver.c:1375 +#: g10/keyserver.c:1371 #, c-format msgid "searching for \"%s\" from %s server %s\n" msgstr "ske etter %s fra %s server %s\n" -#: g10/keyserver.c:1378 +#: g10/keyserver.c:1374 #, c-format msgid "searching for \"%s\" from %s\n" msgstr "sker etter %s fra %s\n" -#: g10/keyserver.c:1385 g10/keyserver.c:1481 +#: g10/keyserver.c:1381 g10/keyserver.c:1477 msgid "no keyserver action!\n" msgstr "ingen handling for nkkelserver!\n" -#: g10/keyserver.c:1433 +#: g10/keyserver.c:1429 #, c-format msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n" msgstr "" -#: g10/keyserver.c:1442 +#: g10/keyserver.c:1438 msgid "keyserver did not send VERSION\n" msgstr "nkkelserver sendte ikke VERSION\n" -#: g10/keyserver.c:1504 +#: g10/keyserver.c:1500 g10/keyserver.c:2028 msgid "no keyserver known (use option --keyserver)\n" msgstr "" -#: g10/keyserver.c:1510 +#: g10/keyserver.c:1506 msgid "external keyserver calls are not supported in this build\n" msgstr "" -#: g10/keyserver.c:1522 +#: g10/keyserver.c:1518 #, c-format msgid "no handler for keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1527 +#: g10/keyserver.c:1523 #, c-format msgid "action `%s' not supported with keyserver scheme `%s'\n" msgstr "" -#: g10/keyserver.c:1535 +#: g10/keyserver.c:1531 #, c-format msgid "%s does not support handler version %d\n" msgstr "" -#: g10/keyserver.c:1542 +#: g10/keyserver.c:1538 msgid "keyserver timed out\n" msgstr "nkkelserver svarte ikke tidsnok\n" -#: g10/keyserver.c:1547 +#: g10/keyserver.c:1543 msgid "keyserver internal error\n" msgstr "intern feil ved nkkelserver\n" -#: g10/keyserver.c:1556 +#: g10/keyserver.c:1552 #, c-format msgid "keyserver communications error: %s\n" msgstr "kommunikasjonsfeil med nkkelserver: %s\n" -#: g10/keyserver.c:1581 g10/keyserver.c:1615 +#: g10/keyserver.c:1577 g10/keyserver.c:1611 #, c-format msgid "\"%s\" not a key ID: skipping\n" msgstr "" -#: g10/keyserver.c:1874 +#: g10/keyserver.c:1870 #, c-format msgid "WARNING: unable to refresh key %s via %s: %s\n" msgstr "ADVARSEL: klarte ikke oppfriske nkkel %s via %s: %s\n" -#: g10/keyserver.c:1896 +#: g10/keyserver.c:1892 #, c-format msgid "refreshing 1 key from %s\n" msgstr "oppfrisker 1 nkkel fra %s\n" -#: g10/keyserver.c:1898 +#: g10/keyserver.c:1894 #, c-format msgid "refreshing %d keys from %s\n" msgstr "oppfrisker %d nkler fra %s\n" -#: g10/keyserver.c:1963 +#: g10/keyserver.c:1950 #, c-format msgid "WARNING: unable to fetch URI %s: %s\n" msgstr "ADVARSEL: klarte ikke fange URI %s: %s\n" -#: g10/keyserver.c:1969 +#: g10/keyserver.c:1956 #, c-format msgid "WARNING: unable to parse URI %s\n" msgstr "ADVARSEL: klarte ikke parse URI %s\n" @@ -4356,112 +4409,112 @@ msgstr "opprinnelig filnavn= msgid "standalone revocation - use \"gpg --import\" to apply\n" msgstr "" -#: g10/mainproc.c:1163 +#: g10/mainproc.c:1165 msgid "no signature found\n" msgstr "ingen signatur ble funnet\n" -#: g10/mainproc.c:1406 +#: g10/mainproc.c:1408 msgid "signature verification suppressed\n" msgstr "" -#: g10/mainproc.c:1506 +#: g10/mainproc.c:1508 msgid "can't handle this ambiguous signature data\n" msgstr "" -#: g10/mainproc.c:1517 +#: g10/mainproc.c:1519 #, c-format msgid "Signature made %s\n" msgstr "Signatur opprettet %s\n" -#: g10/mainproc.c:1518 +#: g10/mainproc.c:1520 #, c-format msgid " using %s key %s\n" msgstr " bruker %s nkkel %s\n" -#: g10/mainproc.c:1522 +#: g10/mainproc.c:1524 #, c-format msgid "Signature made %s using %s key ID %s\n" msgstr "Signatur laget %s ved hjelp av %s-nkkel ID %s\n" -#: g10/mainproc.c:1542 +#: g10/mainproc.c:1544 msgid "Key available at: " msgstr "Nkkel tilgjengelig ved: " -#: g10/mainproc.c:1675 g10/mainproc.c:1723 +#: g10/mainproc.c:1677 g10/mainproc.c:1725 #, c-format msgid "BAD signature from \"%s\"" msgstr "DRLIG signatur fra %s" -#: g10/mainproc.c:1677 g10/mainproc.c:1725 +#: g10/mainproc.c:1679 g10/mainproc.c:1727 #, c-format msgid "Expired signature from \"%s\"" msgstr "Utgtt signatur fra %s" -#: g10/mainproc.c:1679 g10/mainproc.c:1727 +#: g10/mainproc.c:1681 g10/mainproc.c:1729 #, c-format msgid "Good signature from \"%s\"" msgstr "God signatur fra %s" -#: g10/mainproc.c:1731 +#: g10/mainproc.c:1733 msgid "[uncertain]" msgstr "[usikker]" -#: g10/mainproc.c:1763 +#: g10/mainproc.c:1765 #, c-format msgid " aka \"%s\"" msgstr " aka %s" -#: g10/mainproc.c:1861 +#: g10/mainproc.c:1863 #, c-format msgid "Signature expired %s\n" msgstr "Signatur utgtt %s\n" -#: g10/mainproc.c:1866 +#: g10/mainproc.c:1868 #, c-format msgid "Signature expires %s\n" msgstr "Signatur utgr %s\n" -#: g10/mainproc.c:1869 +#: g10/mainproc.c:1871 #, c-format msgid "%s signature, digest algorithm %s\n" msgstr "%s signatur, digestalgoritme %s\n" -#: g10/mainproc.c:1870 +#: g10/mainproc.c:1872 msgid "binary" msgstr "binr" -#: g10/mainproc.c:1871 +#: g10/mainproc.c:1873 msgid "textmode" msgstr "tekstmodus" -#: g10/mainproc.c:1871 g10/trustdb.c:531 +#: g10/mainproc.c:1873 g10/trustdb.c:531 msgid "unknown" msgstr "ukjent" -#: g10/mainproc.c:1891 +#: g10/mainproc.c:1893 #, c-format msgid "Can't check signature: %s\n" msgstr "" -#: g10/mainproc.c:1960 g10/mainproc.c:1976 g10/mainproc.c:2062 +#: g10/mainproc.c:1962 g10/mainproc.c:1978 g10/mainproc.c:2064 msgid "not a detached signature\n" msgstr "" -#: g10/mainproc.c:2003 +#: g10/mainproc.c:2005 msgid "" "WARNING: multiple signatures detected. Only the first will be checked.\n" msgstr "" -#: g10/mainproc.c:2011 +#: g10/mainproc.c:2013 #, c-format msgid "standalone signature of class 0x%02x\n" msgstr "" -#: g10/mainproc.c:2068 +#: g10/mainproc.c:2070 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:2078 +#: g10/mainproc.c:2080 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -4603,7 +4656,7 @@ msgstr "" msgid "WARNING: potentially insecure symmetrically encrypted session key\n" msgstr "" -#: g10/parse-packet.c:1147 +#: g10/parse-packet.c:1157 #, c-format msgid "subpacket of type %d has critical bit set\n" msgstr "" @@ -4725,7 +4778,11 @@ msgstr " msgid "Is this photo correct (y/N/q)? " msgstr "" -#: g10/photoid.c:369 +#: g10/photoid.c:329 +msgid "no photo viewer set\n" +msgstr "" + +#: g10/photoid.c:383 msgid "unable to display photo ID!\n" msgstr "" @@ -4773,7 +4830,9 @@ msgstr " aka #: g10/pkclist.c:256 msgid "" "How much do you trust that this key actually belongs to the named user?\n" -msgstr "Hvor mye stoler du p at denne nkkelen faktisk tilhrer den angitte brukeren?\n" +msgstr "" +"Hvor mye stoler du p at denne nkkelen faktisk tilhrer den angitte " +"brukeren?\n" #: g10/pkclist.c:271 #, c-format @@ -4824,12 +4883,16 @@ msgstr "Sertifikater som f #: g10/pkclist.c:419 #, c-format msgid "%s: There is no assurance this key belongs to the named user\n" -msgstr "%s: Det finnes ingen indikasjon p at denne nkkelen faktisk tilhrer den angitte eieren\n" +msgstr "" +"%s: Det finnes ingen indikasjon p at denne nkkelen faktisk tilhrer den " +"angitte eieren\n" #: g10/pkclist.c:424 #, c-format msgid "%s: There is limited assurance this key belongs to the named user\n" -msgstr "%s: Det er begrenset indikasjon p at denne nkkelen faktisk tilhrer den angitte eieren\n" +msgstr "" +"%s: Det er begrenset indikasjon p at denne nkkelen faktisk tilhrer den " +"angitte eieren\n" #: g10/pkclist.c:430 msgid "This key probably belongs to the named user\n" @@ -4859,11 +4922,13 @@ msgstr "ADVARSEL: Bruker ubetrodd n #: g10/pkclist.c:509 msgid "WARNING: this key might be revoked (revocation key not present)\n" -msgstr "ADVARSEL: nkkel %s kan vre opphevet: opphevingsnkkel %s ikke tilstede.\n" +msgstr "" +"ADVARSEL: nkkel %s kan vre opphevet: opphevingsnkkel %s ikke tilstede.\n" #: g10/pkclist.c:518 msgid "WARNING: This key has been revoked by its designated revoker!\n" -msgstr "ADVARSEL: Denne nkkelen har blitt opphevet av den utpekte oppheveren!\n" +msgstr "" +"ADVARSEL: Denne nkkelen har blitt opphevet av den utpekte oppheveren!\n" #: g10/pkclist.c:521 msgid "WARNING: This key has been revoked by its owner!\n" @@ -4992,28 +5057,28 @@ msgstr "ingen gyldige adressater\n" msgid "data not saved; use option \"--output\" to save it\n" msgstr "" -#: g10/plaintext.c:136 g10/plaintext.c:141 g10/plaintext.c:159 +#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158 #, c-format msgid "error creating `%s': %s\n" msgstr "" -#: g10/plaintext.c:453 +#: g10/plaintext.c:452 msgid "Detached signature.\n" msgstr "" -#: g10/plaintext.c:459 +#: g10/plaintext.c:458 msgid "Please enter name of data file: " msgstr "" -#: g10/plaintext.c:491 +#: g10/plaintext.c:490 msgid "reading stdin ...\n" msgstr "" -#: g10/plaintext.c:525 +#: g10/plaintext.c:524 msgid "no signed data\n" msgstr "" -#: g10/plaintext.c:539 +#: g10/plaintext.c:538 #, c-format msgid "can't open signed data `%s'\n" msgstr "" @@ -5039,7 +5104,8 @@ msgstr "" #: g10/pubkey-enc.c:282 #, c-format msgid "WARNING: cipher algorithm %s not found in recipient preferences\n" -msgstr "ptvinging av kompresjonsalgoritme %s bryter med mottakerens preferanser\n" +msgstr "" +"ptvinging av kompresjonsalgoritme %s bryter med mottakerens preferanser\n" #: g10/pubkey-enc.c:302 #, c-format @@ -5243,14 +5309,18 @@ msgstr "" #, c-format msgid "" "key %s was created %lu second in the future (time warp or clock problem)\n" -msgstr "nkkel %s ble opprettet %lu sekund i fremtiden (time warp eller klokkeproblem)\n" +msgstr "" +"nkkel %s ble opprettet %lu sekund i fremtiden (time warp eller " +"klokkeproblem)\n" # Er dette flertallsformen av denne og den forrige strengen? #: g10/sig-check.c:195 #, c-format msgid "" "key %s was created %lu seconds in the future (time warp or clock problem)\n" -msgstr "nkkel %s ble opprettet %lu sekunder i fremtiden (time warp eller klokkeproblem)\n" +msgstr "" +"nkkel %s ble opprettet %lu sekunder i fremtiden (time warp eller " +"klokkeproblem)\n" #: g10/sig-check.c:205 #, c-format @@ -5306,39 +5376,37 @@ msgid "" "unexpanded.\n" msgstr "" -#: g10/sign.c:328 -msgid "DSA requires the use of a 160 bit hash algorithm\n" -msgstr "DSA krever bruk av en 160-bit hashalgoritme\n" - -#: g10/sign.c:357 +#: g10/sign.c:347 #, c-format msgid "checking created signature failed: %s\n" msgstr "" -#: g10/sign.c:366 +#: g10/sign.c:356 #, c-format msgid "%s/%s signature from: \"%s\"\n" msgstr "%s/%s-signatur fra: %s\n" -#: g10/sign.c:759 +#: g10/sign.c:788 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:828 +#: g10/sign.c:862 #, c-format msgid "" "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n" -msgstr "ADVARSEL: ptvinging av kompresjonsalgoritme %s (%d) bryter med mottakerens preferanser\n" +msgstr "" +"ADVARSEL: ptvinging av kompresjonsalgoritme %s (%d) bryter med mottakerens " +"preferanser\n" -#: g10/sign.c:928 +#: g10/sign.c:988 msgid "signing:" msgstr "" -#: g10/sign.c:1040 +#: g10/sign.c:1100 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n" msgstr "" -#: g10/sign.c:1218 +#: g10/sign.c:1278 #, c-format msgid "%s encryption will be used\n" msgstr "" @@ -5960,6 +6028,7 @@ msgstr "... dette er en feil (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "du fant en feil ... (%s:%d)\n" +#. TRANSLATORS: See doc/TRANSLATE about this string. #: util/miscutil.c:330 util/miscutil.c:367 msgid "yes" msgstr "ja" @@ -5968,6 +6037,7 @@ msgstr "ja" msgid "yY" msgstr "jJ" +#. TRANSLATORS: See doc/TRANSLATE about this string. #: util/miscutil.c:333 util/miscutil.c:369 msgid "no" msgstr "nei" @@ -5976,6 +6046,7 @@ msgstr "nei" msgid "nN" msgstr "nN" +#. TRANSLATORS: See doc/TRANSLATE about this string. #: util/miscutil.c:371 msgid "quit" msgstr "avslutt" @@ -5984,10 +6055,12 @@ msgstr "avslutt" msgid "qQ" msgstr "aA" +#. TRANSLATORS: See doc/TRANSLATE about this string. #: util/miscutil.c:407 msgid "okay|okay" msgstr "okay|okay" +#. TRANSLATORS: See doc/TRANSLATE about this string. #: util/miscutil.c:409 msgid "cancel|cancel" msgstr "cancel|cancel" @@ -6015,3 +6088,6 @@ msgstr "operasjonen er ikke mulig uten initialisert sikkert minne\n" #: util/secmem.c:351 msgid "(you may have used the wrong program for this task)\n" msgstr "(du kan ha brukt feil program for denne oppgaven)\n" + +#~ msgid "DSA requires the use of a 160 bit hash algorithm\n" +#~ msgstr "DSA krever bruk av en 160-bit hashalgoritme\n" diff --git a/po/pl.po b/po/pl.po index c35d92c54..b8ead6cbd 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.2.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2004-06-23 15:54+0200\n" "Last-Translator: Janusz A. Urbanowicz \n" "Language-Team: Polish \n" @@ -712,10 +712,20 @@ msgstr "zapisuj msgid "Invalid command (try \"help\")\n" msgstr "Niepoprawna komenda (sprbuj \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "brak klucza prywatnego" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "usunicie bloku klucza nie powiodo si: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/pt.po b/po/pt.po index 92a82026d..55e5046fc 100644 --- a/po/pt.po +++ b/po/pt.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2002-09-13 18:26+0100\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" @@ -694,10 +694,20 @@ msgstr "a escrever chave privada para `%s'\n" msgid "Invalid command (try \"help\")\n" msgstr "Comando invlido (tente \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "chave secreta no disponvel" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "remoo do bloco de chave falhou: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/pt_BR.po b/po/pt_BR.po index c92389ee8..47ce0fb78 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gnupg 1.0\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 1998-11-20 23:46:36-0200\n" "Last-Translator:\n" "Language-Team: ?\n" @@ -701,10 +701,20 @@ msgstr "escrevendo certificado privado para `%s'\n" msgid "Invalid command (try \"help\")\n" msgstr "Comando invlido (tente \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "chave secreta no disponvel" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "enumerao de blocos de chaves falhou: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/ro.po b/po/ro.po index 61d5cb93a..ea2e0a0ff 100644 --- a/po/ro.po +++ b/po/ro.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.2rc1\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2005-05-31 22:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" @@ -669,12 +669,22 @@ msgstr "Nu sunt permise comenzi administrare\n" msgid "Invalid command (try \"help\")\n" msgstr "Comand invalid (ncercai \"ajutor\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "cheia secret nu e disponibil" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" "V rugm introducei cardul i apsai return sau apsai 'c' pentru a " "renuna: " +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "stergere keyblock a euat: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/ru.po b/po/ru.po index 0a3dcbf31..ce79870e0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GnuPG 1.4.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2005-06-22 02:53+0200\n" "Last-Translator: Maxim Britov \n" "Language-Team: Russian \n" @@ -667,10 +667,20 @@ msgstr "Команды администрирования не разрешен msgid "Invalid command (try \"help\")\n" msgstr "Недопустимая команда (список команд: \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "секретный ключ не найден" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "Вставьте карту и нажмите Enter или введите 'c' для отмены: " +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "сбой при удалении блока ключа: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/sk.po b/po/sk.po index 255adf0ea..1cb824eb4 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2004-07-20 15:52+0200\n" "Last-Translator: Michal Majer \n" "Language-Team: Slovak \n" @@ -691,10 +691,20 @@ msgstr "zapisujem tajn msgid "Invalid command (try \"help\")\n" msgstr "Neplatn prkaz (skste \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "tajn k nie je dostupn" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "zmazanie bloku ka sa nepodarilo: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/sv.po b/po/sv.po index 0876c2eb9..9abf51398 100644 --- a/po/sv.po +++ b/po/sv.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.6\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2004-12-01 17:49+0100\n" "Last-Translator: Per Tunedal \n" "Language-Team: Swedish \n" @@ -715,10 +715,20 @@ msgstr "" msgid "Invalid command (try \"help\")\n" msgstr "Felaktigt kommando (försök med \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "den hemliga nyckeln är inte tillgänglig" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "misslyckades med att radera nyckelblock: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/tr.po b/po/tr.po index 53a488d61..3234887d6 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.1\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2005-03-16 07:30+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -662,11 +662,21 @@ msgstr "Yönetici komutlarına izin verilmez\n" msgid "Invalid command (try \"help\")\n" msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "gizli anahtar kullanışsız" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "" "Lüthen kartı yerleştirdikten sonra ya ya da iptal için 'c' tuşlayın: " +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "anahtar bloğu silinemedi: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 9de43a52e..597e82be5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.4\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2006-07-02 10:58+0800\n" "Last-Translator: Meng Jie \n" "Language-Team: Chinese (simplified) \n" @@ -662,10 +662,20 @@ msgstr "不允许使用管理员命令\n" msgid "Invalid command (try \"help\")\n" msgstr "无效的指令(尝试“help”)\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "私钥不可用" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "请插入卡并回车，或输入‘c’来取消：" +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "删除密钥区块时失败：%s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/po/zh_TW.po b/po/zh_TW.po index 6b07d4492..75aa24e28 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.2\n" "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n" -"POT-Creation-Date: 2006-07-26 12:43+0200\n" +"POT-Creation-Date: 2006-07-28 11:12+0200\n" "PO-Revision-Date: 2005-07-29 09:49+0800\n" "Last-Translator: Jedi \n" "Language-Team: Chinese (traditional) \n" @@ -660,10 +660,20 @@ msgstr "未允許使用管理者指令\n" msgid "Invalid command (try \"help\")\n" msgstr "無效的指令 (試試看 \"help\")\n" +#: g10/cardglue.c:416 +#, fuzzy +msgid "card reader not available\n" +msgstr "無法取用私鑰" + #: g10/cardglue.c:434 msgid "Please insert the card and hit return or enter 'c' to cancel: " msgstr "請插入卡片並按下 [Enter], 或者輸入 'c' 以取消: " +#: g10/cardglue.c:446 +#, fuzzy, c-format +msgid "selecting openpgp failed: %s\n" +msgstr "刪除金鑰區塊時失敗了: %s\n" + #: g10/cardglue.c:573 #, c-format msgid "" diff --git a/util/ChangeLog b/util/ChangeLog index 7b97faeb4..426d4d3c9 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,8 @@ +2006-07-31 Werner Koch + + * iobuf.c (iobuf_ioctl, fd_cache_invalidate): Allow closing all + open files. + 2006-07-29 Marcus Brinkmann * secmem.c (init_pool): Close FD after establishing the mapping. diff --git a/util/iobuf.c b/util/iobuf.c index 09eda49e7..f6e817c42 100644 --- a/util/iobuf.c +++ b/util/iobuf.c @@ -161,14 +161,31 @@ fd_cache_strcmp (const char *a, const char *b) } /* - * Invalidate (i.e. close) a cached iobuf + * Invalidate (i.e. close) a cached iobuf or all iobufs if NULL is + * used for FNAME. */ static void fd_cache_invalidate (const char *fname) { CLOSE_CACHE cc; - assert (fname); + if (!fname) { + if( DBG_IOBUF ) + log_debug ("fd_cache_invalidate (all)\n"); + + for (cc=close_cache; cc; cc = cc->next ) { + if ( cc->fp != INVALID_FP ) { +#ifdef HAVE_DOSISH_SYSTEM + CloseHandle (cc->fp); +#else + close(cc->fp); +#endif + cc->fp = INVALID_FP; + } + } + return; + } + if( DBG_IOBUF ) log_debug ("fd_cache_invalidate (%s)\n", fname); @@ -1275,8 +1292,8 @@ iobuf_ioctl ( IOBUF a, int cmd, int intval, void *ptrval ) else if ( cmd == 2 ) { /* invalidate cache */ if( DBG_IOBUF ) log_debug("iobuf-*.*: ioctl `%s' invalidate\n", - ptrval? (char*)ptrval:"?"); - if ( !a && !intval && ptrval ) { + ptrval? (char*)ptrval:"[all]"); + if ( !a && !intval ) { #ifndef FILE_FILTER_USES_STDIO fd_cache_invalidate (ptrval); #endif