po: Auto-merge

--

26 files changed, 3010 insertions, 3361 deletions

diff --git a/po/ca.po b/po/ca.po
index 6f8339af7..8b75133c3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -459,16 +459,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
 #, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
-
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "fitxer d'opcions «%s»: %s\n"
-
-#, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
@@ -1128,6 +1118,9 @@ msgstr "les ordres entren en conflicte\n"
 msgid "invalid alias definition"
 msgstr "opcions d'importació no vàlides\n"
 
+msgid "permission error"
+msgstr ""
+
 # Gènere?  Nombre?  Passat, futur?  ivb
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
@@ -1137,6 +1130,19 @@ msgid "out of core"
 msgstr "no forçat"
 
 #, fuzzy
+msgid "invalid meta command"
+msgstr "les ordres entren en conflicte\n"
+
+#, fuzzy
+msgid "unknown meta command"
+msgstr "el destinatari predeterminat és desconegut «%s»\n"
+
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "dades inesperades"
+
+#, fuzzy
 msgid "invalid option"
 msgstr "opcions d'importació no vàlides\n"
 
@@ -1164,19 +1170,25 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
-# Gènere?  Nombre?  Passat, futur?  ivb
-# Probablement és una clau, femení. jm
-# Werner FIXME: please add translator comment saying *what* is
-# uncompressed so we know the gender. jm
-#, fuzzy, c-format
-msgid "out of core\n"
-msgstr "no forçat"
-
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opcions d'importació no vàlides\n"
 
 #, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
+
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "fitxer d'opcions «%s»: %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
@@ -7217,6 +7229,14 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
+# Gènere?  Nombre?  Passat, futur?  ivb
+# Probablement és una clau, femení. jm
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "no forçat"
+
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
@@ -9338,154 +9358,115 @@ msgid "No argument allowed"
 msgstr ""
 
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Ordres:\n"
-" "
 
 #, fuzzy
-msgid "decryption modus"
-msgstr "desxifratge correcte\n"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Ordres:\n"
+#~ " "
 
 #, fuzzy
-msgid "encryption modus"
-msgstr "desxifratge correcte\n"
-
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "desxifratge correcte\n"
 
 #, fuzzy
-msgid "program filename"
-msgstr "--store [nom_del_fitxer]"
-
-msgid "secret key file (required)"
-msgstr ""
-
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "encryption modus"
+#~ msgstr "desxifratge correcte\n"
 
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+#~ msgid "program filename"
+#~ msgstr "--store [nom_del_fitxer]"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s no és permés amb %s!\n"
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s no és permés amb %s!\n"
 
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "ha fallat l'actualització de la base de dades de confiança: %s\n"
 
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "no es pot crear el directori «%s»: %s\n"
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "no es pot crear el directori «%s»: %s\n"
 
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "no s'ha pogut obrir %s: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "no s'ha pogut obrir %s: %s\n"
 
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "error en la lectura de «%s»: %s\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "error en la lectura de «%s»: %s\n"
 
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "error en la lectura de «%s»: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "error en la lectura de «%s»: %s\n"
 
 # Execució de programes remots, o execució remota de programes? jm
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "no hi ha suport per a l'execució remota de programes\n"
-
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
-
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
-
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "no s'ha pogut crear «%s»: %s\n"
-
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "no s'ha pogut crear «%s»: %s\n"
-
-#, fuzzy, c-format
-msgid "could not fork: %s\n"
-msgstr "%s: no s'ha trobat l'usuari: %s\n"
-
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "ha fallat l'actualització: %s\n"
-
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "no hi ha suport per a l'execució remota de programes\n"
 
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "ha fallat l'actualització: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "ha fallat l'actualització: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "ha fallat l'actualització: %s\n"
+#, fuzzy
+#~ msgid "could not fork: %s\n"
+#~ msgstr "%s: no s'ha trobat l'usuari: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "ha fallat l'actualització: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "%s: no s'ha creat l'anell: %s\n"
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "no s'ha pogut crear «%s»: %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "ha fallat l'actualització: %s\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "ha fallat l'actualització: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "ha fallat l'actualització: %s\n"
 
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "l'algoritme de protecció %d%s no està suportat\n"
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "%s: no s'ha creat l'anell: %s\n"
 
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "no s'ha pogut crear «%s»: %s\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid "class %s is not supported\n"
+#~ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
 #, fuzzy
 #~ msgid " using certificate ID 0x%08lX\n"
@@ -10726,9 +10707,6 @@ msgstr ""
 #~ msgid "file delete error"
 #~ msgstr "error en l'eliminació del fitxer"
 
-#~ msgid "unexpected data"
-#~ msgstr "dades inesperades"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "conflicte de data"
 
diff --git a/po/cs.po b/po/cs.po
index 10436eee4..f881c7f15 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -436,14 +436,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
 #, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "Poznámka: neexistuje implicitní soubor s možnostmi „%s“\n"
-
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "soubor s možnostmi „%s“: %s\n"
-
-#, c-format
 msgid "reading options from '%s'\n"
 msgstr "čtou se možnosti z „%s“\n"
 
@@ -1047,9 +1039,27 @@ msgstr "neplatný příkaz"
 msgid "invalid alias definition"
 msgstr "neplatný definice aliasu"
 
+msgid "permission error"
+msgstr ""
+
 msgid "out of core"
 msgstr "nedostatek paměti"
 
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "neplatný příkaz"
+
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "neznámý příkaz „%s“\n"
+
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "neočekávaná data"
+
 msgid "invalid option"
 msgstr "neplatný parametr"
 
@@ -1077,16 +1087,23 @@ msgstr "volba „%.50s“ není jednoznačná\n"
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "příkaz „%.50s“ není jednoznačný\n"
 
-# Yet another expression for `not enough memory' :)
-#, c-format
-msgid "out of core\n"
-msgstr "nedostatek paměti\n"
-
 #, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "neplatný parametr „%.50s“\n"
 
 #, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Poznámka: neexistuje implicitní soubor s možnostmi „%s“\n"
+
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "soubor s možnostmi „%s“: %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "převod z „%s“ na „%s“ není k dispozici\n"
 
@@ -6804,6 +6821,11 @@ msgstr "použit ověřovací model: %s"
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%ubitový hash není platná pro %ubitový %s klíč\n"
 
+# Yet another expression for `not enough memory' :)
+#, c-format
+msgid "out of core\n"
+msgstr "nedostatek paměti\n"
+
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(toto je algoritmus MD2)\n"
@@ -8842,154 +8864,129 @@ msgstr "Komponenta nenalezena"
 msgid "No argument allowed"
 msgstr "Žádné argumenty nejsou povoleny"
 
-msgid ""
-"@\n"
-"Commands:\n"
-" "
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 msgstr ""
-"@\n"
-"Příkazy:\n"
-" "
+"Použití: gpg-check-pattern [volby] soubor_se_vzorem (-h pro nápovědu)\n"
 
-msgid "decryption modus"
-msgstr "dešifrovací modus"
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+"Syntaxe: gpg-check-pattern [volby] soubor_se_vzorem\n"
+"Prověří heslo zadané na vstupu proti souboru se vzory\n"
 
-msgid "encryption modus"
-msgstr "šifrovací modus"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Příkazy:\n"
+#~ " "
 
-msgid "tool class (confucius)"
-msgstr "třída nástrojů (Konfucius)"
+#~ msgid "decryption modus"
+#~ msgstr "dešifrovací modus"
 
-msgid "program filename"
-msgstr "název souboru s programem"
+#~ msgid "encryption modus"
+#~ msgstr "šifrovací modus"
 
-msgid "secret key file (required)"
-msgstr "soubor s tajným klíčem (nezbytné)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "třída nástrojů (Konfucius)"
 
-msgid "input file name (default stdin)"
-msgstr "název vstupního souboru (implicitně standardní vstup)"
+#~ msgid "program filename"
+#~ msgstr "název souboru s programem"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Použití: symcryptrun [volby]  (-h pro nápovědu)"
+#~ msgid "secret key file (required)"
+#~ msgstr "soubor s tajným klíčem (nezbytné)"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Syntaxe: symcryptrun --class TŘÍDA --program PROGRAM --keyfile SOUBOR "
-"[VOLBY…] PŘÍKAZ [VSTUPNÍ_SOUBOR]\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "název vstupního souboru (implicitně standardní vstup)"
 
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s nad %s byl ukončen s kódem %i\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Použití: symcryptrun [volby]  (-h pro nápovědu)"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s nad %s selhal s kódem %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Syntaxe: symcryptrun --class TŘÍDA --program PROGRAM --keyfile SOUBOR "
+#~ "[VOLBY…] PŘÍKAZ [VSTUPNÍ_SOUBOR]\n"
 
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "nelze vytvořit dočasný adresář „%s“: %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s nad %s byl ukončen s kódem %i\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "%s nelze otevřít pro zápis: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s nad %s selhal s kódem %i\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "chyba při zápisu do %s: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "nelze vytvořit dočasný adresář „%s“: %s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "chyba při čtení z %s': %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "%s nelze otevřít pro zápis: %s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "chyba při zavírání chyba %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "chyba při zápisu do %s: %s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "nebyla zadána volba --program\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "chyba při čtení z %s': %s\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "pouze --decrypt a --encrypt jsou podporovány\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "chyba při zavírání chyba %s: %s\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "nebyla zadána volba --keyfile\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "nebyla zadána volba --program\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "nelze alokovat pole argumentů\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "pouze --decrypt a --encrypt jsou podporovány\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "nelze vytvořit rouru: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "nebyla zadána volba --keyfile\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "nelze vytvořit PTY: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "nelze alokovat pole argumentů\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "nelze se rozdvojit (fork): %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "nelze vytvořit rouru: %s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv selhalo: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "nelze vytvořit PTY: %s\n"
 
-#, c-format
-msgid "select failed: %s\n"
-msgstr "služba select() selhala: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "nelze se rozdvojit (fork): %s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "čtení selhalo: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv selhalo: %s\n"
 
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "čtení z PTY selhalo: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "služba select() selhala: %s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "služba waitpid() selhala: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "čtení selhalo: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "potomek byl ukončen s kódem %i\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "čtení z PTY selhalo: %s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "nelze alokovat řetězec infile: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "služba waitpid() selhala: %s\n"
 
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "nelze alokovat řetězec outfile: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "potomek byl ukončen s kódem %i\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "musí být zadáno buď %s, nebo %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "nelze alokovat řetězec infile: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr "nezadána žádná třída\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "nelze alokovat řetězec outfile: %s\n"
 
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "třída %s není podporována\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "musí být zadáno buď %s, nebo %s\n"
 
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr ""
-"Použití: gpg-check-pattern [volby] soubor_se_vzorem (-h pro nápovědu)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "nezadána žádná třída\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Syntaxe: gpg-check-pattern [volby] soubor_se_vzorem\n"
-"Prověří heslo zadané na vstupu proti souboru se vzory\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "třída %s není podporována\n"
 
 #~ msgid "male"
 #~ msgstr "muž"
@@ -10577,9 +10574,6 @@ msgstr ""
 #~ msgid "file delete error"
 #~ msgstr "chyba při mazání souboru"
 
-#~ msgid "unexpected data"
-#~ msgstr "neočekávaná data"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "konflikt časového razítka"
 
diff --git a/po/da.po b/po/da.po
index 95fc7166a..f2490b069 100644
--- a/po/da.po
+++ b/po/da.po
@@ -470,16 +470,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "valgt sammendragsalgoritme er ugyldig\n"
 
 #, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "BEMÆRK: Ingen standardfil for tilvalg »%s«\n"
-
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "tilvalgsfil »%s«: %s\n"
-
-#, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "læser tilvalg fra »%s«\n"
@@ -1125,9 +1115,27 @@ msgstr "ugyldig kommando"
 msgid "invalid alias definition"
 msgstr "ugyldig aliasdefinition"
 
+msgid "permission error"
+msgstr ""
+
 msgid "out of core"
 msgstr "ikke nok kerne"
 
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "ugyldig kommando"
+
+#, fuzzy
+#| msgid "unknown command `%s'\n"
+msgid "unknown meta command"
+msgstr "ukendt kommando »%s«\n"
+
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "uventet panser: "
+
 msgid "invalid option"
 msgstr "ugyldig indstilling"
 
@@ -1157,14 +1165,24 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr "kommando »%.50s« er tvetydig\n"
 
 #, c-format
-msgid "out of core\n"
-msgstr "uden for kerne\n"
-
-#, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "ugyldigt tilvalg »%.50s«\n"
 
 #, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "BEMÆRK: Ingen standardfil for tilvalg »%s«\n"
+
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "tilvalgsfil »%s«: %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' not available\n"
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "konvertering fra »%s« til »%s« er ikke tilgængelig\n"
@@ -7173,6 +7191,10 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "en %u-bit-hash er ikke gyldig for en %u-bit %s-nøgle\n"
 
 #, c-format
+msgid "out of core\n"
+msgstr "uden for kerne\n"
+
+#, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(dette er MD2-algoritmen)\n"
 
@@ -9472,155 +9494,131 @@ msgstr "Komponent blev ikke fundet"
 msgid "No argument allowed"
 msgstr "Ingen parameter tilladt"
 
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Brug: gpg-check-pattern [tilvalg] mønsterfil (-h for hjælp)\n"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"Kommandoer:\n"
-" "
+"Syntaks: gpg-check-pattern [tilvalg] mønsterfil\n"
+"Kontroller en adgangsfrase angivet på stdin mod mønsterfilen\n"
 
-msgid "decryption modus"
-msgstr "afkrypteringstilstand"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Kommandoer:\n"
+#~ " "
 
-msgid "encryption modus"
-msgstr "krypteringstilstand"
+#~ msgid "decryption modus"
+#~ msgstr "afkrypteringstilstand"
 
-msgid "tool class (confucius)"
-msgstr "værktøjsklasse (confucius)"
+#~ msgid "encryption modus"
+#~ msgstr "krypteringstilstand"
 
-msgid "program filename"
-msgstr "filnavn for program"
+#~ msgid "tool class (confucius)"
+#~ msgstr "værktøjsklasse (confucius)"
 
-msgid "secret key file (required)"
-msgstr "hemmelig nøglefil (krævet)"
+#~ msgid "program filename"
+#~ msgstr "filnavn for program"
 
-msgid "input file name (default stdin)"
-msgstr "filnavn for inddata (standard stdin)"
+#~ msgid "secret key file (required)"
+#~ msgstr "hemmelig nøglefil (krævet)"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Brug: symcryptrun [tilvalg] (-h for hjælp)"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "filnavn for inddata (standard stdin)"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Syntaks: symcryptrun --class CLASS --program PROGRAM --keyfile NØGLEFIL "
-"[tilvalg ...] KOMMANDO [inddatafil]\n"
-"Kald et simpelt symmetrisk krypteringsværktøj\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Brug: symcryptrun [tilvalg] (-h for hjælp)"
 
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s på %s afbrudt med status %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Syntaks: symcryptrun --class CLASS --program PROGRAM --keyfile NØGLEFIL "
+#~ "[tilvalg ...] KOMMANDO [inddatafil]\n"
+#~ "Kald et simpelt symmetrisk krypteringsværktøj\n"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s på %s mislykkedes med status %i\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s på %s afbrudt med status %i\n"
 
-#, fuzzy, c-format
-#| msgid "can't create temporary directory `%s': %s\n"
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "kan ikke oprette midlertidig mappe »%s«: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s på %s mislykkedes med status %i\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "kunne ikke åbne %s for skrivning: %s\n"
+#, fuzzy
+#~| msgid "can't create temporary directory `%s': %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "kan ikke oprette midlertidig mappe »%s«: %s\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "fejl ved skrivning til »%s«: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "kunne ikke åbne %s for skrivning: %s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "fejl ved læsning fra %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "fejl ved skrivning til »%s«: %s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "fejl ved lukning af %s: %s\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "fejl ved læsning fra %s: %s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "tilvalget --program blev ikke leveret\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "fejl ved lukning af %s: %s\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "kun --decrypt og --encrypt er understøttet\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "tilvalget --program blev ikke leveret\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "tilvalget --keyfile blev ikke leveret\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "kun --decrypt og --encrypt er understøttet\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "kan ikke allokere parametervektor\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "tilvalget --keyfile blev ikke leveret\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "kunne ikke oprette datakanal: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "kan ikke allokere parametervektor\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "kunne ikke oprette pty: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "kunne ikke oprette datakanal: %s\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "kunne ikke forgrene: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "kunne ikke oprette pty: %s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv mislykkedes: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "kunne ikke forgrene: %s\n"
 
-#, c-format
-msgid "select failed: %s\n"
-msgstr "select mislykkedes: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv mislykkedes: %s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "læsning mislykkedes: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "select mislykkedes: %s\n"
 
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "pty-læsning mislykkedes: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "læsning mislykkedes: %s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid mislykkedes: %s\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "pty-læsning mislykkedes: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "underproces afbrudt med status %i\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid mislykkedes: %s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "kan ikke allokere infile-streng: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "underproces afbrudt med status %i\n"
 
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "kan ikke allokere outfile-streng: %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "kan ikke allokere infile-streng: %s\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "enten %s eller %s skal være angivet\n"
-
-#, c-format
-msgid "no class provided\n"
-msgstr "ingen klasse angivet\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "kan ikke allokere outfile-streng: %s\n"
 
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "klasse %s er ikke understøttet\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "enten %s eller %s skal være angivet\n"
 
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Brug: gpg-check-pattern [tilvalg] mønsterfil (-h for hjælp)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "ingen klasse angivet\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Syntaks: gpg-check-pattern [tilvalg] mønsterfil\n"
-"Kontroller en adgangsfrase angivet på stdin mod mønsterfilen\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "klasse %s er ikke understøttet\n"
 
 #~ msgid " using certificate ID 0x%08lX\n"
 #~ msgstr " bruger certifikat-id 0x%08lX\n"
diff --git a/po/de.po b/po/de.po
index c167bf7b7..3e9d68d97 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8989,154 +8989,129 @@ msgstr "Komponente nicht gefunden"
 msgid "No argument allowed"
 msgstr "Argumente sind nicht erlaubt"
 
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Aufruf: gpg-check-pattern [Optionen] Musterdatei  (-h für Hilfe)\n"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"@KBefehle:\n"
-" "
-
-msgid "decryption modus"
-msgstr "Entschlüsselungsmodus"
+"Syntax: gpg-check-pattern [optionen] Musterdatei\n"
+"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
 
-msgid "encryption modus"
-msgstr "Verschlüsselungsmodus"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "@KBefehle:\n"
+#~ " "
 
-msgid "tool class (confucius)"
-msgstr "Toolklasse (Konfuzius)"
+#~ msgid "decryption modus"
+#~ msgstr "Entschlüsselungsmodus"
 
-msgid "program filename"
-msgstr "Programmdateiname"
+#~ msgid "encryption modus"
+#~ msgstr "Verschlüsselungsmodus"
 
-msgid "secret key file (required)"
-msgstr "Dateiname des geheimen Schlüssels (erforderlich)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "Toolklasse (Konfuzius)"
 
-msgid "input file name (default stdin)"
-msgstr "Eingabedateiname (Standardeingabe ist voreingestellt)"
+#~ msgid "program filename"
+#~ msgstr "Programmdateiname"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Aufruf: symcryptrun [Optionen] (-h für Hilfe)"
+#~ msgid "secret key file (required)"
+#~ msgstr "Dateiname des geheimen Schlüssels (erforderlich)"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Syntax: symcryptrun --class KLASSE --program PROGRAMM --keyfile "
-"SCHLUESSELDATEI [Optionen...] KOMMANDO [Eingabedatei]\n"
-"Aufruf eines einfachen symmetrischen Verschlüsselungstool\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "Eingabedateiname (Standardeingabe ist voreingestellt)"
 
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s auf %s brach mit Status %i ab\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Aufruf: symcryptrun [Optionen] (-h für Hilfe)"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s auf %s schlug mit Status %i fehl\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Syntax: symcryptrun --class KLASSE --program PROGRAMM --keyfile "
+#~ "SCHLUESSELDATEI [Optionen...] KOMMANDO [Eingabedatei]\n"
+#~ "Aufruf eines einfachen symmetrischen Verschlüsselungstool\n"
 
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "Das temporäre Verzeichnis `%s' kann nicht erstellt werden: %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s auf %s brach mit Status %i ab\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "%s kann nicht zum Schreiben geöffnet werden: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s auf %s schlug mit Status %i fehl\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "Fehler beim Schreiben von %s: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "Das temporäre Verzeichnis `%s' kann nicht erstellt werden: %s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "Fehler beim Lesen von %s: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "%s kann nicht zum Schreiben geöffnet werden: %s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "Fehler beim Schließen von %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "Fehler beim Schreiben von %s: %s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "Option --program nicht angegeben\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "Fehler beim Lesen von %s: %s\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "nur --decrypt und --encrypt sind vorhanden\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "Fehler beim Schließen von %s: %s\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "keine --keyfile -Option angegeben\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "Option --program nicht angegeben\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "Kann \"args-vector\" nicht zuteilen\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "nur --decrypt und --encrypt sind vorhanden\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "Pipe kann nicht erzeugt werden: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "keine --keyfile -Option angegeben\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "Pty kann nicht erzeugt werden: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "Kann \"args-vector\" nicht zuteilen\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "Kann nicht fork()en: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "Pipe kann nicht erzeugt werden: %s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "Der execv()-Aufruf ist fehlgeschlagen: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "Pty kann nicht erzeugt werden: %s\n"
 
-#, c-format
-msgid "select failed: %s\n"
-msgstr "Der select()-Aufruf ist fehlgeschlagen: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "Kann nicht fork()en: %s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "Lesen schlug fehl: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "Der execv()-Aufruf ist fehlgeschlagen: %s\n"
 
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "\"pty read\"-Aufruf ist fehlgeschlagen: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "Der select()-Aufruf ist fehlgeschlagen: %s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "Der waitpid()-Aufruf ist fehlgeschlagen: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "Lesen schlug fehl: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "Kind brach mit Status %i ab\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "\"pty read\"-Aufruf ist fehlgeschlagen: %s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "Kann In-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "Der waitpid()-Aufruf ist fehlgeschlagen: %s\n"
 
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "Kann Out-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "Kind brach mit Status %i ab\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "entweder %s oder %s muß angegeben sein\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "Kann In-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr "keine Klasse angegeben\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "Kann Out-Datei-Zeichenkette keinen Speicher zuteilen: %s\n"
 
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "Klasse %s wird nicht unterstützt\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "entweder %s oder %s muß angegeben sein\n"
 
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Aufruf: gpg-check-pattern [Optionen] Musterdatei  (-h für Hilfe)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "keine Klasse angegeben\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Syntax: gpg-check-pattern [optionen] Musterdatei\n"
-"Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "Klasse %s wird nicht unterstützt\n"
 
 #~ msgid " using certificate ID 0x%08lX\n"
 #~ msgstr " mittels Zertifikat ID 0x%08lX\n"
diff --git a/po/el.po b/po/el.po
index 8cedba81d..444621da6 100644
--- a/po/el.po
+++ b/po/el.po
@@ -430,16 +430,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγόριθμος περίληψης δεν είναι έγκυρος\n"
 
 #, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "ΣΗΜΕΙΩΣΗ: μη προκαθορισμένο αρχείο επιλογών `%s'\n"
-
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "αρχείο επιλογών `%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "ανάγνωση επιλογών από `%s'\n"
@@ -1077,11 +1067,27 @@ msgstr "συγκρουόμενες εντολές\n"
 msgid "invalid alias definition"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
+msgid "permission error"
+msgstr ""
+
 #, fuzzy
 msgid "out of core"
 msgstr "μη επεξεργασμένο"
 
 #, fuzzy
+msgid "invalid meta command"
+msgstr "συγκρουόμενες εντολές\n"
+
+#, fuzzy
+msgid "unknown meta command"
+msgstr "άγνωστος προκαθορισμένος παραλήπτης `%s'\n"
+
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "μη αναμενόμενα δεδομένα"
+
+#, fuzzy
 msgid "invalid option"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
@@ -1110,14 +1116,24 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "out of core\n"
-msgstr "μη επεξεργασμένο"
-
-#, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "μη έγκυρες επιλογές ειγαγωγής\n"
 
 #, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "ΣΗΜΕΙΩΣΗ: μη προκαθορισμένο αρχείο επιλογών `%s'\n"
+
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "αρχείο επιλογών `%s': %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "θωράκιση απέτυχε: %s\n"
 
@@ -7074,6 +7090,10 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "μη επεξεργασμένο"
+
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
@@ -9167,153 +9187,110 @@ msgid "No argument allowed"
 msgstr "εγγραφή του μυστικού κλειδιού στο `%s'\n"
 
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Εντολές:\n"
-" "
 
 #, fuzzy
-msgid "decryption modus"
-msgstr "αποκρυπτογράφηση OK\n"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Εντολές:\n"
+#~ " "
 
 #, fuzzy
-msgid "encryption modus"
-msgstr "αποκρυπτογράφηση OK\n"
-
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "αποκρυπτογράφηση OK\n"
 
 #, fuzzy
-msgid "program filename"
-msgstr "--store [όνομα αρχείου]"
-
-msgid "secret key file (required)"
-msgstr ""
-
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "encryption modus"
+#~ msgstr "αποκρυπτογράφηση OK\n"
 
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
-
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "το %s δεν επιτρέπεται με το %s!\n"
-
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
-
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "αδυναμία πρόσβασης του %s: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "δεν υποστηρίζετε η απομακρυσμένη εκτέλεση προγράμματος\n"
+#~ msgid "program filename"
+#~ msgstr "--store [όνομα αρχείου]"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "το %s δεν επιτρέπεται με το %s!\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "αδυναμία πρόσβασης του αρχείου: %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "αδυναμία δημιουργίας του %s: %s\n"
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "αδυναμία δημιουργίας καταλόγου `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "αδυναμία δημιουργίας του %s: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "αδυναμία πρόσβασης του %s: %s\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "αδυναμία εγγραφής της κλειδοθήκης `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "η ενημέρωση απέτυχε: %s\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "η ενημέρωση απέτυχε: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "δεν υποστηρίζετε η απομακρυσμένη εκτέλεση προγράμματος\n"
 
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "η ενημέρωση απέτυχε: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "αδυναμία δημιουργίας του %s: %s\n"
 
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "η ενημέρωση απέτυχε: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "αδυναμία δημιουργίας του %s: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "αδυναμία δημιουργίας του `%s': %s\n"
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "διαγραφή block κλειδιών απέτυχε: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "αδυναμία δημιουργίας του `%s': %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "η ενημέρωση απέτυχε: %s\n"
 
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "αδυναμία δημιουργίας του `%s': %s\n"
 
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Χρήση: gpg [επιλογές] [αρχεία] (-h για βοήθεια)"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "αδυναμία δημιουργίας του `%s': %s\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid "class %s is not supported\n"
+#~ msgstr "δεν υποστηρίζεται ο αλγόριθμος προστασίας %d%s\n"
 
 #, fuzzy
 #~ msgid " using certificate ID 0x%08lX\n"
@@ -10532,9 +10509,6 @@ msgstr ""
 #~ msgid "file delete error"
 #~ msgstr "σφάλμα διαγραφής αρχείου"
 
-#~ msgid "unexpected data"
-#~ msgstr "μη αναμενόμενα δεδομένα"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "σύγκρουση ώρας (timestamp)"
 
diff --git a/po/eo.po b/po/eo.po
index 5cfc0bd34..4dac13969 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -431,16 +431,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
 #, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
-
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "opcio-dosiero '%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "legas opciojn el '%s'\n"
@@ -1081,11 +1071,27 @@ msgstr "malkongruaj komandoj\n"
 msgid "invalid alias definition"
 msgstr "nevalida kiraso"
 
+msgid "permission error"
+msgstr ""
+
 #, fuzzy
 msgid "out of core"
 msgstr "ne traktita"
 
 #, fuzzy
+msgid "invalid meta command"
+msgstr "malkongruaj komandoj\n"
+
+#, fuzzy
+msgid "unknown meta command"
+msgstr "nekonata implicita ricevonto '%s'\n"
+
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "neatendita dateno"
+
+#, fuzzy
 msgid "invalid option"
 msgstr "nevalida kiraso"
 
@@ -1114,14 +1120,24 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "out of core\n"
-msgstr "ne traktita"
-
-#, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "nevalida kiraso"
 
 #, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
+
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "opcio-dosiero '%s': %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
@@ -6997,6 +7013,10 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "ne traktita"
+
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
@@ -9081,153 +9101,110 @@ msgid "No argument allowed"
 msgstr "skribas sekretan ŝlosilon al '%s'\n"
 
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Komandoj:\n"
-" "
 
 #, fuzzy
-msgid "decryption modus"
-msgstr "malĉifrado sukcesis\n"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Komandoj:\n"
+#~ " "
 
 #, fuzzy
-msgid "encryption modus"
-msgstr "malĉifrado sukcesis\n"
-
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "malĉifrado sukcesis\n"
 
 #, fuzzy
-msgid "program filename"
-msgstr "--store [dosiero]"
-
-msgid "secret key file (required)"
-msgstr ""
-
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "encryption modus"
+#~ msgstr "malĉifrado sukcesis\n"
 
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
-
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s ne eblas kun %s!\n"
-
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
-
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "%s: ne povas krei dosierujon: %s\n"
-
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "ne povas malfermi %s: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
-
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "eraro dum legado de '%s': %s\n"
-
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "eraro dum legado de '%s': %s\n"
-
-#, c-format
-msgid "no --program option provided\n"
-msgstr ""
+#~ msgid "program filename"
+#~ msgstr "--store [dosiero]"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s ne eblas kun %s!\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "ne povas krei %s: %s\n"
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "ne povas krei %s: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "ne povas malfermi %s: %s\n"
 
-#, fuzzy, c-format
-msgid "could not fork: %s\n"
-msgstr "%s: uzanto ne trovita: %s\n"
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "eraro dum skribado de ŝlosilaro '%s': %s\n"
 
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "aktualigo malsukcesis: %s\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "eraro dum legado de '%s': %s\n"
 
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "eraro dum legado de '%s': %s\n"
 
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "aktualigo malsukcesis: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "ne povas krei %s: %s\n"
 
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "aktualigo malsukcesis: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "ne povas krei %s: %s\n"
 
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "aktualigo malsukcesis: %s\n"
+#, fuzzy
+#~ msgid "could not fork: %s\n"
+#~ msgstr "%s: uzanto ne trovita: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "aktualigo malsukcesis: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "ne povas krei '%s': %s\n"
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "forviŝo de ŝlosilbloko malsukcesis: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "ne povas krei '%s': %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "aktualigo malsukcesis: %s\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "aktualigo malsukcesis: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "aktualigo malsukcesis: %s\n"
 
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "protekto-metodo %d%s ne estas realigita\n"
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "ne povas krei '%s': %s\n"
 
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "ne povas krei '%s': %s\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid "class %s is not supported\n"
+#~ msgstr "protekto-metodo %d%s ne estas realigita\n"
 
 #, fuzzy
 #~ msgid " using certificate ID 0x%08lX\n"
@@ -10335,9 +10312,6 @@ msgstr ""
 #~ msgid "file delete error"
 #~ msgstr "eraro ĉe forviŝo de dosiero"
 
-#~ msgid "unexpected data"
-#~ msgstr "neatendita dateno"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "malkongruo de tempostampoj"
 
diff --git a/po/es.po b/po/es.po
index 12b0db5f7..e7fda8d26 100644
--- a/po/es.po
+++ b/po/es.po
@@ -431,14 +431,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inválido\n"
 
 #, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "NOTA: no existe el fichero de opciones predeterminado '%s'\n"
-
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "fichero de opciones '%s': %s\n"
-
-#, c-format
 msgid "reading options from '%s'\n"
 msgstr "leyendo opciones de '%s'\n"
 
@@ -1051,9 +1043,27 @@ msgstr "orden inválida"
 msgid "invalid alias definition"
 msgstr "definición de alias inválida"
 
+msgid "permission error"
+msgstr ""
+
 msgid "out of core"
 msgstr "memoria desbordada"
 
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "orden inválida"
+
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "orden desconocida '%s'\n"
+
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "datos inesperados"
+
 msgid "invalid option"
 msgstr "opción inválida"
 
@@ -1082,14 +1092,22 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr "la orden \"%.50s\" es ambigua\n"
 
 #, c-format
-msgid "out of core\n"
-msgstr "memoria desbordada\n"
-
-#, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opción inválida \"%.50s\"\n"
 
 #, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "NOTA: no existe el fichero de opciones predeterminado '%s'\n"
+
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "fichero de opciones '%s': %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "la conversión de '%s' a '%s' no está disponible\n"
 
@@ -6796,6 +6814,10 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "un hash de %u bits no vale para %u bits de la clave %s\n"
 
 #, c-format
+msgid "out of core\n"
+msgstr "memoria desbordada\n"
+
+#, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(es el algoritmo MD2)\n"
 
@@ -8855,160 +8877,135 @@ msgstr "Componente no encontrado"
 msgid "No argument allowed"
 msgstr "No se permiten parámetros"
 
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr ""
+"Uso: gpg-check-pattern [opciones] [fichero_de_patrones] (-h para ayuda)\n"
+
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+"Sintaxis: gpg-check-pattern [opciones] fichero_de_patrones\n"
+"Compara frase contraseña dada en entrada estándar con un fichero de "
+"patrones\n"
+
 # Órdenes, please...
 # Sí, este no he podido ser yo :-) Por cierto, ¿por qué la O no se
 # puede acentuar? ¿demasiado alta?
 # ¿Quién dice que no se puede? :-)
-msgid ""
-"@\n"
-"Commands:\n"
-" "
-msgstr ""
-"@\n"
-"Órdenes:\n"
-" "
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Órdenes:\n"
+#~ " "
 
-msgid "decryption modus"
-msgstr "modo de descifrado"
+#~ msgid "decryption modus"
+#~ msgstr "modo de descifrado"
 
-msgid "encryption modus"
-msgstr "modo de cifrado"
+#~ msgid "encryption modus"
+#~ msgstr "modo de cifrado"
 
-msgid "tool class (confucius)"
-msgstr "clase de herramienta (confucius)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "clase de herramienta (confucius)"
 
-msgid "program filename"
-msgstr "nombre del programa"
+#~ msgid "program filename"
+#~ msgstr "nombre del programa"
 
-msgid "secret key file (required)"
-msgstr "fichero de clave secreta (requerido)"
+#~ msgid "secret key file (required)"
+#~ msgstr "fichero de clave secreta (requerido)"
 
-msgid "input file name (default stdin)"
-msgstr "nombre del fichero de entrada (por defecto stdin)"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "nombre del fichero de entrada (por defecto stdin)"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Uso: symcryptrun [opciones] (-h para ayuda)"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Uso: symcryptrun [opciones] (-h para ayuda)"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Sintaxis: symcryptrun --class CLASE --program PROGRAMA --keyfile FICHERO "
-"[opciones...] ORDEN [fichero entrada]\n"
-"Invocar una herramienta simple de cifrado simétrico\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Sintaxis: symcryptrun --class CLASE --program PROGRAMA --keyfile FICHERO "
+#~ "[opciones...] ORDEN [fichero entrada]\n"
+#~ "Invocar una herramienta simple de cifrado simétrico\n"
 
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s en %s abortó con estado %i\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s en %s abortó con estado %i\n"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s en %s falló con estado %i\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s en %s falló con estado %i\n"
 
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "no se puede crear el directorio temporal '%s': %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "no se puede crear el directorio temporal '%s': %s\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "no se puede abrir %s para escribir: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "no se puede abrir %s para escribir: %s\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "error escribiendo en %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "error escribiendo en %s: %s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "error al leer de %s: %s\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "error al leer de %s: %s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "error cerrando %s: %s\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "error cerrando %s: %s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "falta la opción --program\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "falta la opción --program\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "sólo pueden usarse --decrypt y --encrypt\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "sólo pueden usarse --decrypt y --encrypt\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "falta la opción --keyfile\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "falta la opción --keyfile\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "no puedo reservar espacio para el vector de parámetros\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "no puedo reservar espacio para el vector de parámetros\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "no se pudo crear la tubería: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "no se pudo crear la tubería: %s\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "no se pudo crear pty: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "no se pudo crear pty: %s\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "no se puede bifurcar: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "no se puede bifurcar: %s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv fallido: %s\n"
-
-#, c-format
-msgid "select failed: %s\n"
-msgstr "select fallido: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv fallido: %s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "lectura fallida: %s\n"
-
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "lectura de pty fallida: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "select fallido: %s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid fallido: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "lectura fallida: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "proceso hijo abortado con estado %i\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "lectura de pty fallida: %s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "no puedo reservar espacio para la cadena de entrada: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid fallido: %s\n"
 
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "no puedo reservar espacio para la cadena de salida: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "proceso hijo abortado con estado %i\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "debe darse %s o bien %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "no puedo reservar espacio para la cadena de entrada: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr "se necesita una clase\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "no puedo reservar espacio para la cadena de salida: %s\n"
 
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "la clase %s no puede usarse\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "debe darse %s o bien %s\n"
 
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr ""
-"Uso: gpg-check-pattern [opciones] [fichero_de_patrones] (-h para ayuda)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "se necesita una clase\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Sintaxis: gpg-check-pattern [opciones] fichero_de_patrones\n"
-"Compara frase contraseña dada en entrada estándar con un fichero de "
-"patrones\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "la clase %s no puede usarse\n"
 
 #~ msgid " using certificate ID 0x%08lX\n"
 #~ msgstr " usando el certificado ID 0x%08lX\n"
@@ -10369,9 +10366,6 @@ msgstr ""
 #~ msgid "file delete error"
 #~ msgstr "error al borrar fichero"
 
-#~ msgid "unexpected data"
-#~ msgstr "datos inesperados"
-
 # o tal vez "en el sello..."
 # Creo que es mejor "con el sello de fecha", no es un conflicto
 # del sello en si mismo sino en relación con el mensaje.
diff --git a/po/et.po b/po/et.po
index 2b5d6de92..c42cc52b8 100644
--- a/po/et.po
+++ b/po/et.po
@@ -427,16 +427,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
 #, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n"
-
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "võtmete fail `%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "loen võtmeid failist `%s'\n"
@@ -1074,11 +1064,27 @@ msgstr "vastuolulised käsud\n"
 msgid "invalid alias definition"
 msgstr "vigased impordi võtmed\n"
 
+msgid "permission error"
+msgstr ""
+
 #, fuzzy
 msgid "out of core"
 msgstr "ei töödeldud"
 
 #, fuzzy
+msgid "invalid meta command"
+msgstr "vastuolulised käsud\n"
+
+#, fuzzy
+msgid "unknown meta command"
+msgstr "tundmatu vaikimisi saaja `%s'\n"
+
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "ootamatud andmed"
+
+#, fuzzy
 msgid "invalid option"
 msgstr "vigased impordi võtmed\n"
 
@@ -1107,14 +1113,24 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "out of core\n"
-msgstr "ei töödeldud"
-
-#, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "vigased impordi võtmed\n"
 
 #, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "MÄRKUS: vaikimisi võtmete fail `%s' puudub\n"
+
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "võtmete fail `%s': %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
@@ -6995,6 +7011,10 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "ei töödeldud"
+
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
@@ -9083,153 +9103,110 @@ msgid "No argument allowed"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Käsud:\n"
-" "
 
 #, fuzzy
-msgid "decryption modus"
-msgstr "lahtikrüpteerimine õnnestus\n"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Käsud:\n"
+#~ " "
 
 #, fuzzy
-msgid "encryption modus"
-msgstr "lahtikrüpteerimine õnnestus\n"
-
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "lahtikrüpteerimine õnnestus\n"
 
 #, fuzzy
-msgid "program filename"
-msgstr "--store [failinimi]"
-
-msgid "secret key file (required)"
-msgstr ""
-
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "encryption modus"
+#~ msgstr "lahtikrüpteerimine õnnestus\n"
 
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
-
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s ja %s ei ole koos lubatud!\n"
-
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "faili ei õnnestu avada: %s\n"
-
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
-
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "%s ei õnnestu avada: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
-
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
-
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
-
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "mittelokaalse programmi käivitamist ei toetata\n"
+#~ msgid "program filename"
+#~ msgstr "--store [failinimi]"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "faili ei õnnestu avada: %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "%s ei õnnestu luua: %s\n"
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "%s ei õnnestu luua: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "%s ei õnnestu avada: %s\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "viga `%s' lugemisel: %s\n"
 
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "viga `%s' lugemisel: %s\n"
 
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "mittelokaalse programmi käivitamist ei toetata\n"
 
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "%s ei õnnestu luua: %s\n"
 
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "uuendamine ebaõnnestus: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "%s ei õnnestu luua: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "uuendamine ebaõnnestus: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "`%s' ei õnnestu luua: %s\n"
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "`%s' ei õnnestu luua: %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "uuendamine ebaõnnestus: %s\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "uuendamine ebaõnnestus: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "uuendamine ebaõnnestus: %s\n"
 
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "kaitse algoritm %d%s ei ole toetatud\n"
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "`%s' ei õnnestu luua: %s\n"
 
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "`%s' ei õnnestu luua: %s\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid "class %s is not supported\n"
+#~ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
 #, fuzzy
 #~ msgid " using certificate ID 0x%08lX\n"
@@ -10409,9 +10386,6 @@ msgstr ""
 #~ msgid "file delete error"
 #~ msgstr "viga faili kustutamisel"
 
-#~ msgid "unexpected data"
-#~ msgstr "ootamatud andmed"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "ajatemplite konflikt"
 
diff --git a/po/fi.po b/po/fi.po
index 507d1462c..f2a9c29c8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -444,16 +444,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
 #, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
-
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "asetustiedosto \"%s\": %s\n"
-
-#, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
@@ -1091,11 +1081,27 @@ msgstr "ristiriitainen komento\n"
 msgid "invalid alias definition"
 msgstr "virheelliset tuontivalitsimet\n"
 
+msgid "permission error"
+msgstr ""
+
 #, fuzzy
 msgid "out of core"
 msgstr "ei käsitelty"
 
 #, fuzzy
+msgid "invalid meta command"
+msgstr "ristiriitainen komento\n"
+
+#, fuzzy
+msgid "unknown meta command"
+msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
+
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "odottamatonta dataa"
+
+#, fuzzy
 msgid "invalid option"
 msgstr "virheelliset tuontivalitsimet\n"
 
@@ -1124,14 +1130,24 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "out of core\n"
-msgstr "ei käsitelty"
-
-#, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
 #, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
+
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "asetustiedosto \"%s\": %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
@@ -7056,6 +7072,10 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "ei käsitelty"
+
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
@@ -9147,153 +9167,110 @@ msgid "No argument allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Komennot:\n"
-" "
 
 #, fuzzy
-msgid "decryption modus"
-msgstr "avaus onnistui\n"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Komennot:\n"
+#~ " "
 
 #, fuzzy
-msgid "encryption modus"
-msgstr "avaus onnistui\n"
-
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "avaus onnistui\n"
 
 #, fuzzy
-msgid "program filename"
-msgstr "--store [tiedostonimi]"
-
-msgid "secret key file (required)"
-msgstr ""
-
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "encryption modus"
+#~ msgstr "avaus onnistui\n"
 
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
-
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
-
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "ei voi avata tiedostoa: %s\n"
-
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
-
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "tiedostoa %s ei voi avata: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
-
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "etäohjelman suorittamista ei tueta\n"
+#~ msgid "program filename"
+#~ msgstr "--store [tiedostonimi]"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "ei voi avata tiedostoa: %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "ei voida luoda kohdetta %s: %s\n"
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "ei voida luoda kohdetta %s: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "tiedostoa %s ei voi avata: %s\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "päivitys epäonnistui: %s\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "avainlohkojen poisto epäonnistui: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "päivitys epäonnistui: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "etäohjelman suorittamista ei tueta\n"
 
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "päivitys epäonnistui: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "päivitys epäonnistui: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "päivitys epäonnistui: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "päivitys epäonnistui: %s\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "päivitys epäonnistui: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "päivitys epäonnistui: %s\n"
 
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid "class %s is not supported\n"
+#~ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
 #, fuzzy
 #~ msgid " using certificate ID 0x%08lX\n"
@@ -10509,9 +10486,6 @@ msgstr ""
 #~ msgid "file delete error"
 #~ msgstr "virhe tiedostoa poistettaessa"
 
-#~ msgid "unexpected data"
-#~ msgstr "odottamatonta dataa"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "aikaleima ei täsmää"
 
diff --git a/po/fr.po b/po/fr.po
index 8f297c432..4336ced2d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -436,14 +436,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est incorrecte\n"
 
 #, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "Remarque : pas de fichier d'options par défaut « %s »\n"
-
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "fichier d'options « %s » : %s\n"
-
-#, c-format
 msgid "reading options from '%s'\n"
 msgstr "lecture des options de « %s »\n"
 
@@ -1066,9 +1058,27 @@ msgstr "commande incorrecte"
 msgid "invalid alias definition"
 msgstr "définition d'alias incorrecte"
 
+msgid "permission error"
+msgstr ""
+
 msgid "out of core"
 msgstr "hors limite"
 
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "commande incorrecte"
+
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "commande « %s » inconnue\n"
+
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "données inattendues"
+
 msgid "invalid option"
 msgstr "option incorrecte"
 
@@ -1097,14 +1107,22 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr "la commande « %.50s » est ambiguë\n"
 
 #, c-format
-msgid "out of core\n"
-msgstr "hors limite\n"
-
-#, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "option « %.50s » incorrecte\n"
 
 #, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Remarque : pas de fichier d'options par défaut « %s »\n"
+
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "fichier d'options « %s » : %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "conversion de « %s » vers « %s » non disponible\n"
 
@@ -7099,6 +7117,10 @@ msgstr ""
 "un hachage de %1$u bits n'est pas valable pour une clef %3$s de %2$u bits\n"
 
 #, c-format
+msgid "out of core\n"
+msgstr "hors limite\n"
+
+#, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(c'est l'algorithme MD2)\n"
 
@@ -9233,155 +9255,130 @@ msgstr "Composant introuvable"
 msgid "No argument allowed"
 msgstr "Aucun argument permis"
 
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Utilisation : gpg-check-pattern [options] ficmotif (-h pour l'aide)\n"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"Commandes :\n"
-" "
-
-msgid "decryption modus"
-msgstr "mode déchiffrement"
+"Syntaxe : gpg-check-pattern [options] ficmotif\n"
+"Vérifier une phrase secrète donnée sur l'entrée standard par rapport à "
+"ficmotif\n"
 
-msgid "encryption modus"
-msgstr "mode chiffrement"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Commandes :\n"
+#~ " "
 
-msgid "tool class (confucius)"
-msgstr "classe d'outils (confucius)"
+#~ msgid "decryption modus"
+#~ msgstr "mode déchiffrement"
 
-msgid "program filename"
-msgstr "nom de fichier du programme"
+#~ msgid "encryption modus"
+#~ msgstr "mode chiffrement"
 
-msgid "secret key file (required)"
-msgstr "fichier de clef secrète (nécessaire)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "classe d'outils (confucius)"
 
-msgid "input file name (default stdin)"
-msgstr "nom de fichier d'entrée (entrée standard par défaut)"
+#~ msgid "program filename"
+#~ msgstr "nom de fichier du programme"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Utilisation : symcryptrun [options] (-h pour l'aide)"
+#~ msgid "secret key file (required)"
+#~ msgstr "fichier de clef secrète (nécessaire)"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Syntax : symcryptrun --class CLASSE --program PROGRAMME --keyfile CLEF "
-"[options...] COMMANDE [entrée]\n"
-"Appeler un simple outil de chiffrement symétrique\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "nom de fichier d'entrée (entrée standard par défaut)"
 
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "interruption de %s sur %s avec l'état %i\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Utilisation : symcryptrun [options] (-h pour l'aide)"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "échec de %s sur %s avec l'état %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Syntax : symcryptrun --class CLASSE --program PROGRAMME --keyfile CLEF "
+#~ "[options...] COMMANDE [entrée]\n"
+#~ "Appeler un simple outil de chiffrement symétrique\n"
 
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "impossible de créer le répertoire temporaire « %s » : %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "interruption de %s sur %s avec l'état %i\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "impossible d'ouvrir %s en écriture : %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "échec de %s sur %s avec l'état %i\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "erreur d'écriture sur %s : %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "impossible de créer le répertoire temporaire « %s » : %s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "erreur de lecture de %s : %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "impossible d'ouvrir %s en écriture : %s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "erreur de fermeture de %s : %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "erreur d'écriture sur %s : %s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "aucune option --program fournie\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "erreur de lecture de %s : %s\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "seuls --decrypt et --encrypt sont pris en charge\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "erreur de fermeture de %s : %s\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "aucune option --keyfile fournie\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "aucune option --program fournie\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "impossible d'allouer le vecteur d'arguments\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "seuls --decrypt et --encrypt sont pris en charge\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "impossible de créer un tube : %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "aucune option --keyfile fournie\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "impossible de créer le pty : %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "impossible d'allouer le vecteur d'arguments\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "impossible de créer un processus fils : %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "impossible de créer un tube : %s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "échec d'execv : %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "impossible de créer le pty : %s\n"
 
-#, c-format
-msgid "select failed: %s\n"
-msgstr "échec de select : %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "impossible de créer un processus fils : %s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "échec de lecture : %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "échec d'execv : %s\n"
 
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "échec de lecture du pty : %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "échec de select : %s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "échec de waitpid : %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "échec de lecture : %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "interruption du fils avec l'état %i\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "échec de lecture du pty : %s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "impossible d'allouer la chaîne infile : %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "échec de waitpid : %s\n"
 
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "impossible d'allouer la chaîne outfile : %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "interruption du fils avec l'état %i\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "soit %s, soit %s doit être donné\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "impossible d'allouer la chaîne infile : %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr "aucune classe fournie\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "impossible d'allouer la chaîne outfile : %s\n"
 
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "la classe %s n'est pas prise en charge\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "soit %s, soit %s doit être donné\n"
 
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Utilisation : gpg-check-pattern [options] ficmotif (-h pour l'aide)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "aucune classe fournie\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Syntaxe : gpg-check-pattern [options] ficmotif\n"
-"Vérifier une phrase secrète donnée sur l'entrée standard par rapport à "
-"ficmotif\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "la classe %s n'est pas prise en charge\n"
 
 #~ msgid " using certificate ID 0x%08lX\n"
 #~ msgstr " en utilisant le certificat d'identifiant 0x%08lX\n"
@@ -10697,9 +10694,6 @@ msgstr ""
 #~ msgid "file delete error"
 #~ msgstr "erreur de suppression du fichier"
 
-#~ msgid "unexpected data"
-#~ msgstr "données inattendues"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "conflit de date"
 
diff --git a/po/gl.po b/po/gl.po
index 7cf244cad..6359470d5 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -431,16 +431,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non é válido\n"
 
 #, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "NOTA: non existe o ficheiro de opcións por defecto `%s'\n"
-
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "ficheiro de opcións `%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "lendo as opcións de `%s'\n"
@@ -1082,11 +1072,27 @@ msgstr "comandos conflictivos\n"
 msgid "invalid alias definition"
 msgstr "opcións de importación non válidas\n"
 
+msgid "permission error"
+msgstr ""
+
 #, fuzzy
 msgid "out of core"
 msgstr "non procesado"
 
 #, fuzzy
+msgid "invalid meta command"
+msgstr "comandos conflictivos\n"
+
+#, fuzzy
+msgid "unknown meta command"
+msgstr "destinatario por defecto `%s' descoñecido\n"
+
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "datos inesperados"
+
+#, fuzzy
 msgid "invalid option"
 msgstr "opcións de importación non válidas\n"
 
@@ -1115,14 +1121,24 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "out of core\n"
-msgstr "non procesado"
-
-#, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opcións de importación non válidas\n"
 
 #, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "NOTA: non existe o ficheiro de opcións por defecto `%s'\n"
+
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "ficheiro de opcións `%s': %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
@@ -7066,6 +7082,10 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "non procesado"
+
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
@@ -9162,155 +9182,116 @@ msgid "No argument allowed"
 msgstr "gravando a chave secreta en `%s'\n"
 
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Comandos:\n"
-" "
 
 #, fuzzy
-msgid "decryption modus"
-msgstr "descifrado correcto\n"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Comandos:\n"
+#~ " "
 
 #, fuzzy
-msgid "encryption modus"
-msgstr "descifrado correcto\n"
-
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "descifrado correcto\n"
 
 #, fuzzy
-msgid "program filename"
-msgstr "--store [ficheiro]"
-
-msgid "secret key file (required)"
-msgstr ""
-
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "encryption modus"
+#~ msgstr "descifrado correcto\n"
 
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
-
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "¡%s non se admite con %s!\n"
-
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr ""
-"a actualización da base de datos de confianza fallou:\n"
-"%s\n"
-
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "non se pode crea-lo directorio `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "non se puido abrir %s: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "erro escribindo no chaveiro `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "erro lendo `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "erro lendo `%s': %s\n"
+#~ msgid "program filename"
+#~ msgstr "--store [ficheiro]"
 
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "non se soporta a execución remota de programas\n"
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "¡%s non se admite con %s!\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr ""
+#~ "a actualización da base de datos de confianza fallou:\n"
+#~ "%s\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "non foi posible crear %s: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "non se puido abrir %s: %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "non foi posible crear %s: %s\n"
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "could not fork: %s\n"
-msgstr "%s: non se atopou o usuario: %s\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "erro lendo `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "a actualización fallou: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "erro lendo `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "fallou o borrado do bloque de chaves: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "non se soporta a execución remota de programas\n"
 
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "a actualización fallou: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "non foi posible crear %s: %s\n"
 
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "a actualización fallou: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "non foi posible crear %s: %s\n"
 
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "a actualización fallou: %s\n"
+#, fuzzy
+#~ msgid "could not fork: %s\n"
+#~ msgstr "%s: non se atopou o usuario: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "a actualización fallou: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "non se pode crear `%s': %s\n"
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "non se pode crear `%s': %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "a actualización fallou: %s\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "a actualización fallou: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "a actualización fallou: %s\n"
 
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "o algoritmo de protección %d%s non está soportado\n"
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "non se pode crear `%s': %s\n"
 
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "non se pode crear `%s': %s\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid "class %s is not supported\n"
+#~ msgstr "o algoritmo de protección %d%s non está soportado\n"
 
 #, fuzzy
 #~ msgid " using certificate ID 0x%08lX\n"
@@ -10528,9 +10509,6 @@ msgstr ""
 #~ msgid "file delete error"
 #~ msgstr "erro de borrado de ficheiro"
 
-#~ msgid "unexpected data"
-#~ msgstr "datos inesperados"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "conflicto de selo de data"
 
diff --git a/po/hu.po b/po/hu.po
index ac9d361c4..e5837cb8e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -427,16 +427,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
 #, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "MEGJEGYZÉS: Nincs alapértelmezett opciós fájl (%s).\n"
-
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "\"%s\" opciós fájl: %s\n"
-
-#, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
@@ -1074,11 +1064,27 @@ msgstr "Egymásnak ellentmondó parancsok!\n"
 msgid "invalid alias definition"
 msgstr "Érvénytelen import opciók!\n"
 
+msgid "permission error"
+msgstr ""
+
 #, fuzzy
 msgid "out of core"
 msgstr "nem feldolgozott"
 
 #, fuzzy
+msgid "invalid meta command"
+msgstr "Egymásnak ellentmondó parancsok!\n"
+
+#, fuzzy
+msgid "unknown meta command"
+msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
+
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "nem várt adat"
+
+#, fuzzy
 msgid "invalid option"
 msgstr "Érvénytelen import opciók!\n"
 
@@ -1107,14 +1113,24 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "out of core\n"
-msgstr "nem feldolgozott"
-
-#, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "Érvénytelen import opciók!\n"
 
 #, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "MEGJEGYZÉS: Nincs alapértelmezett opciós fájl (%s).\n"
+
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "\"%s\" opciós fájl: %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
@@ -7019,6 +7035,10 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "nem feldolgozott"
+
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
@@ -9108,153 +9128,110 @@ msgid "No argument allowed"
 msgstr "Írom a titkos kulcsot a %s állományba.\n"
 
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Parancsok:\n"
-" "
 
 #, fuzzy
-msgid "decryption modus"
-msgstr "Visszafejtés rendben.\n"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Parancsok:\n"
+#~ " "
 
 #, fuzzy
-msgid "encryption modus"
-msgstr "Visszafejtés rendben.\n"
-
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "Visszafejtés rendben.\n"
 
 #, fuzzy
-msgid "program filename"
-msgstr "--store [fájlnév]"
-
-msgid "secret key file (required)"
-msgstr ""
-
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "encryption modus"
+#~ msgstr "Visszafejtés rendben.\n"
 
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
-
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s és %s nem használható együtt!\n"
-
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "Nem tudom megnyitni az állományt: %s.\n"
-
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
-
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "Nem tudom megnyitni %s-t: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
-
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "Hiba \"%s\" olvasásakor: %s\n"
-
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "Hiba \"%s\" olvasásakor: %s\n"
-
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "Külső program meghívása nem támogatott.\n"
+#~ msgid "program filename"
+#~ msgstr "--store [fájlnév]"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s és %s nem használható együtt!\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "Nem tudom megnyitni az állományt: %s.\n"
 
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "%s nem hozható létre: %s\n"
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "%s nem hozható létre: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "Nem tudom megnyitni %s-t: %s\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "Frissítés sikertelen: %s.\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "A kulcsblokk törlése sikertelen: %s.\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "Frissítés sikertelen: %s.\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "Külső program meghívása nem támogatott.\n"
 
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "Frissítés sikertelen: %s.\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "%s nem hozható létre: %s\n"
 
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "Frissítés sikertelen: %s.\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "%s nem hozható létre: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "Frissítés sikertelen: %s.\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "Frissítés sikertelen: %s.\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "Frissítés sikertelen: %s.\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "Frissítés sikertelen: %s.\n"
 
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "%d%s védő algoritmus nem támogatott.\n"
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid "class %s is not supported\n"
+#~ msgstr "%d%s védő algoritmus nem támogatott.\n"
 
 #, fuzzy
 #~ msgid " using certificate ID 0x%08lX\n"
@@ -10462,9 +10439,6 @@ msgstr ""
 #~ msgid "file delete error"
 #~ msgstr "állománytörlési hiba"
 
-#~ msgid "unexpected data"
-#~ msgstr "nem várt adat"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "időbélyeg-konfliktus"
 
diff --git a/po/id.po b/po/id.po
index abc847974..d48c1fa80 100644
--- a/po/id.po
+++ b/po/id.po
@@ -432,16 +432,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
 #, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
-
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "file pilihan `%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
@@ -1079,11 +1069,27 @@ msgstr "perintah saling konflik\n"
 msgid "invalid alias definition"
 msgstr "opsi impor tidak valid\n"
 
+msgid "permission error"
+msgstr ""
+
 #, fuzzy
 msgid "out of core"
 msgstr "tidak diproses"
 
 #, fuzzy
+msgid "invalid meta command"
+msgstr "perintah saling konflik\n"
+
+#, fuzzy
+msgid "unknown meta command"
+msgstr "penerima baku tidak dikenal `%s'\n"
+
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "data tidak terduga"
+
+#, fuzzy
 msgid "invalid option"
 msgstr "opsi impor tidak valid\n"
 
@@ -1112,14 +1118,24 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "out of core\n"
-msgstr "tidak diproses"
-
-#, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opsi impor tidak valid\n"
 
 #, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
+
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "file pilihan `%s': %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "gagal enarmoring: %s\n"
 
@@ -7017,6 +7033,10 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "tidak diproses"
+
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
@@ -9106,153 +9126,110 @@ msgid "No argument allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Perintah:\n"
-" "
 
 #, fuzzy
-msgid "decryption modus"
-msgstr "dekripsi lancar\n"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Perintah:\n"
+#~ " "
 
 #, fuzzy
-msgid "encryption modus"
-msgstr "dekripsi lancar\n"
-
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "dekripsi lancar\n"
 
 #, fuzzy
-msgid "program filename"
-msgstr "--store [namafile]"
-
-msgid "secret key file (required)"
-msgstr ""
-
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "encryption modus"
+#~ msgstr "dekripsi lancar\n"
 
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
-
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s tidak dibolehkan dengan %s!\n"
-
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "tidak dapat membuka file: %s\n"
-
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "tidak dapat membuat direktori `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "tidak dapat membuka %s: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "kesalahan menulis keyring `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "kesalahan membaca `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "kesalahan membaca `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "tidak ada eksekusi program remote yang didukung\n"
+#~ msgid "program filename"
+#~ msgstr "--store [namafile]"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "tidak dapat membuka file: %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "tidak dapat membuat %s: %s\n"
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "tidak dapat membuat %s: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "tidak dapat membuka %s: %s\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "gagal memperbarui: %s\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "kesalahan membaca `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "gagal menghapus keyblok: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "kesalahan membaca `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "gagal memperbarui: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "tidak ada eksekusi program remote yang didukung\n"
 
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "gagal memperbarui: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "tidak dapat membuat %s: %s\n"
 
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "gagal memperbarui: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "tidak dapat membuat %s: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "gagal memperbarui: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "tidak dapat membuat %s: %s\n"
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "gagal menghapus keyblok: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "tidak dapat membuat %s: %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "gagal memperbarui: %s\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "gagal memperbarui: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "gagal memperbarui: %s\n"
 
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "algoritma proteksi %d%s tidak didukung\n"
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "tidak dapat membuat %s: %s\n"
 
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "tidak dapat membuat %s: %s\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid "class %s is not supported\n"
+#~ msgstr "algoritma proteksi %d%s tidak didukung\n"
 
 #, fuzzy
 #~ msgid " using certificate ID 0x%08lX\n"
@@ -10465,9 +10442,6 @@ msgstr ""
 #~ msgid "file delete error"
 #~ msgstr "kesalahan hapus file"
 
-#~ msgid "unexpected data"
-#~ msgstr "data tidak terduga"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "konflik timestamp"
 
diff --git a/po/it.po b/po/it.po
index e90b58b01..f56662e99 100644
--- a/po/it.po
+++ b/po/it.po
@@ -405,14 +405,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
 #, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "Nota: nessun file di opzioni predefinito '%s'\n"
-
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "file di opzioni '%s': %s\n"
-
-#, c-format
 msgid "reading options from '%s'\n"
 msgstr "opzioni di lettura da '%s'\n"
 
@@ -1023,9 +1015,27 @@ msgstr "comando non valido"
 msgid "invalid alias definition"
 msgstr "definizione di alias non valida"
 
+msgid "permission error"
+msgstr ""
+
 msgid "out of core"
 msgstr "fuori dal nucleo"
 
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "comando non valido"
+
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "comando sconosciuto '%s'\n"
+
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "armatura inaspettata: "
+
 msgid "invalid option"
 msgstr "opzione non valida"
 
@@ -1054,14 +1064,22 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr "il comando \"%.50s\" è ambiguo\n"
 
 #, c-format
-msgid "out of core\n"
-msgstr "fuori dal nucleo\n"
-
-#, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opzione non valida \"%.50s\"\n"
 
 #, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Nota: nessun file di opzioni predefinito '%s'\n"
+
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "file di opzioni '%s': %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "conversione da '%s' a '%s' non disponibile\n"
 
@@ -6822,6 +6840,10 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "un hash di bit %u non è valido per una chiave %u bit %s\n"
 
 #, c-format
+msgid "out of core\n"
+msgstr "fuori dal nucleo\n"
+
+#, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(questo è l'algoritmo MD2)\n"
 
@@ -8888,151 +8910,126 @@ msgstr "Componente non trovato"
 msgid "No argument allowed"
 msgstr "Nessun argomento consentito"
 
-msgid ""
-"@\n"
-"Commands:\n"
-" "
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 msgstr ""
-"@Comandi:\n"
-" "
+"Utilizzo: gpg-check-pattern [opzioni] patternfile (-h per assistenza)\n"
 
-msgid "decryption modus"
-msgstr "modus di decrittazione"
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+"Sintassi: gpg-check-pattern [opzioni] patternfile\n"
+"Controllare una passphrase data su stdin rispetto al patternfile\n"
 
-msgid "encryption modus"
-msgstr "modus di crittografia"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Comandi:\n"
+#~ " "
 
-msgid "tool class (confucius)"
-msgstr "classe di utensili (confucio)"
+#~ msgid "decryption modus"
+#~ msgstr "modus di decrittazione"
 
-msgid "program filename"
-msgstr "nome file del programma"
+#~ msgid "encryption modus"
+#~ msgstr "modus di crittografia"
 
-msgid "secret key file (required)"
-msgstr "file di chiave segreta (obbligatorio)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "classe di utensili (confucio)"
 
-msgid "input file name (default stdin)"
-msgstr "nome del file di input (stdin predefinito)"
+#~ msgid "program filename"
+#~ msgstr "nome file del programma"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Utilizzo: symcryptrun [opzioni] (-h per assistenza)"
+#~ msgid "secret key file (required)"
+#~ msgstr "file di chiave segreta (obbligatorio)"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Sintassi: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[opzioni...] COMANDO [file di input]\n"
-"Chiamare un semplice strumento di crittografia simmetrica\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "nome del file di input (stdin predefinito)"
 
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s su %s interrotto con stato %i\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Utilizzo: symcryptrun [opzioni] (-h per assistenza)"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s su %s non riuscito con stato %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Sintassi: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[opzioni...] COMANDO [file di input]\n"
+#~ "Chiamare un semplice strumento di crittografia simmetrica\n"
 
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "impossibile creare la directory temporanea '%s': %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s su %s interrotto con stato %i\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "impossibile aprire %s per la scrittura: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s su %s non riuscito con stato %i\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "errore durante la scrittura in %s: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "impossibile creare la directory temporanea '%s': %s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "errore durante la lettura da %s: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "impossibile aprire %s per la scrittura: %s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "errore durante la chiusura di %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "errore durante la scrittura in %s: %s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "no --opzione di programma fornita\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "errore durante la lettura da %s: %s\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "solo --decrypt e --encrypt sono supportati\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "errore durante la chiusura di %s: %s\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "nessuna opzione --keyfile fornita\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "no --opzione di programma fornita\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "impossibile allocare il vettore args\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "solo --decrypt e --encrypt sono supportati\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "impossibile creare la pipe: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "nessuna opzione --keyfile fornita\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "impossibile creare pty: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "impossibile allocare il vettore args\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "non poteva dividere: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "impossibile creare la pipe: %s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv non riuscito: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "impossibile creare pty: %s\n"
 
-#, c-format
-msgid "select failed: %s\n"
-msgstr "selezione non riuscita: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "non poteva dividere: %s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "lettura non riuscita: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv non riuscito: %s\n"
 
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "lettura pty non riuscita: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "selezione non riuscita: %s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid non riuscito: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "lettura non riuscita: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "figlio interrotto con stato %i\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "lettura pty non riuscita: %s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "impossibile allocare la stringa nel file: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid non riuscito: %s\n"
 
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "non può allocare la stringa del file di uscita: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "figlio interrotto con stato %i\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "e' necessario specificare %s o %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "impossibile allocare la stringa nel file: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr "nessuna classe fornita\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "non può allocare la stringa del file di uscita: %s\n"
 
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "la classe %s non è supportata\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "e' necessario specificare %s o %s\n"
 
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr ""
-"Utilizzo: gpg-check-pattern [opzioni] patternfile (-h per assistenza)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "nessuna classe fornita\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Sintassi: gpg-check-pattern [opzioni] patternfile\n"
-"Controllare una passphrase data su stdin rispetto al patternfile\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "la classe %s non è supportata\n"
diff --git a/po/ja.po b/po/ja.po
index b268dd965..9b3f7fc8d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -403,14 +403,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "選択されたダイジェスト・アルゴリズムは、無効です\n"
 
 #, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "注意: デフォルトのオプション・ファイル '%s' がありません\n"
-
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "オプション・ファイル '%s': %s\n"
-
-#, c-format
 msgid "reading options from '%s'\n"
 msgstr "'%s' からオプションを読み込みます\n"
 
@@ -1015,9 +1007,27 @@ msgstr "無効なコマンド"
 msgid "invalid alias definition"
 msgstr "無効なエイリアス定義です"
 
+msgid "permission error"
+msgstr ""
+
 msgid "out of core"
 msgstr "メモリがありません"
 
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "無効なコマンド"
+
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "不明のコマンド'%s'\n"
+
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "予期せぬ外装: "
+
 msgid "invalid option"
 msgstr "無効なオプション"
 
@@ -1046,14 +1056,22 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr "コマンド\"%.50s\"はあいまいです\n"
 
 #, c-format
-msgid "out of core\n"
-msgstr "メモリがありません\n"
-
-#, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "無効なオプション \"%.50s\"\n"
 
 #, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "注意: デフォルトのオプション・ファイル '%s' がありません\n"
+
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "オプション・ファイル '%s': %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "'%s'から'%s'への変換は利用できません\n"
 
@@ -6579,6 +6597,10 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%uビットハッシュは%uビットの%s鍵には無効です\n"
 
 #, c-format
+msgid "out of core\n"
+msgstr "メモリがありません\n"
+
+#, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(これはMD2アルゴリズムです)\n"
 
@@ -8594,154 +8616,129 @@ msgstr "コンポーネントが見つかりません"
 msgid "No argument allowed"
 msgstr "引数は許可されていません"
 
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "使い方: gpg-check-pattern [オプション] patternfile (ヘルプは -h)\n"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"@コマンド:\n"
-" "
-
-msgid "decryption modus"
-msgstr "復号方式"
+"形式: gpg-check-pattern [オプション] パターンファイル\n"
+"パターンファイルに対して標準入力のパスフレーズを確認する\n"
 
-msgid "encryption modus"
-msgstr "暗号方式"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "@コマンド:\n"
+#~ " "
 
-msgid "tool class (confucius)"
-msgstr "ツール・クラス (confucius)"
+#~ msgid "decryption modus"
+#~ msgstr "復号方式"
 
-msgid "program filename"
-msgstr "program [ファイル名]"
+#~ msgid "encryption modus"
+#~ msgstr "暗号方式"
 
-msgid "secret key file (required)"
-msgstr "秘密鍵ファイル (必須)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "ツール・クラス (confucius)"
 
-msgid "input file name (default stdin)"
-msgstr "入力ファイル名 (デフォルト stdin)"
+#~ msgid "program filename"
+#~ msgstr "program [ファイル名]"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "使い方: symcryption [オプション] (ヘルプは -h)"
+#~ msgid "secret key file (required)"
+#~ msgstr "秘密鍵ファイル (必須)"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"形式: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE [オプショ"
-"ン...] COMMAND [入力ファイル]\n"
-"シンプルな共通鍵暗号ツールを呼び出す\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "入力ファイル名 (デフォルト stdin)"
 
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s (%s の)がステイタス%iで中止されました\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "使い方: symcryption [オプション] (ヘルプは -h)"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s (%s の)がステイタス%iで失敗しました\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "形式: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE [オプ"
+#~ "ション...] COMMAND [入力ファイル]\n"
+#~ "シンプルな共通鍵暗号ツールを呼び出す\n"
 
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "一時ディレクトリ'%s'が作成できません: %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s (%s の)がステイタス%iで中止されました\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "%sを書き込みでオープンできませんでした: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s (%s の)がステイタス%iで失敗しました\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "'%s'の書き込みエラー: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "一時ディレクトリ'%s'が作成できません: %s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "'%s'の読み込みエラー: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "%sを書き込みでオープンできませんでした: %s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "'%s'でクローズのエラー: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "'%s'の書き込みエラー: %s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "--programオプションが指定されていません\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "'%s'の読み込みエラー: %s\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "--decryptと--encryptだけがサポートされています\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "'%s'でクローズのエラー: %s\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "--keyfileオプションが与えられていません\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "--programオプションが指定されていません\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "引数ベクタが確保できません\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "--decryptと--encryptだけがサポートされています\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "パイプが作成できませんでした: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "--keyfileオプションが与えられていません\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "ptyが作成できませんでした: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "引数ベクタが確保できません\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "fork できませんでした: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "パイプが作成できませんでした: %s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv が失敗しました: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "ptyが作成できませんでした: %s\n"
 
-#, c-format
-msgid "select failed: %s\n"
-msgstr "select が失敗しました: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "fork できませんでした: %s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "read が失敗しました: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv が失敗しました: %s\n"
 
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "pty read が失敗しました: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "select が失敗しました: %s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid が失敗しました: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "read が失敗しました: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "子プロセスがステイタス %i で中止されました\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "pty read が失敗しました: %s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "infileの文字列が確保できません: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid が失敗しました: %s\n"
 
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "outfileの文字列を確保できません: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "子プロセスがステイタス %i で中止されました\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "%s か %s のどちらかが与えられる必要があります\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "infileの文字列が確保できません: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr "クラスが与えられていません\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "outfileの文字列を確保できません: %s\n"
 
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "クラス%sはサポートされていません\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "%s か %s のどちらかが与えられる必要があります\n"
 
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "使い方: gpg-check-pattern [オプション] patternfile (ヘルプは -h)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "クラスが与えられていません\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"形式: gpg-check-pattern [オプション] パターンファイル\n"
-"パターンファイルに対して標準入力のパスフレーズを確認する\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "クラス%sはサポートされていません\n"
 
 #~ msgid " using certificate ID 0x%08lX\n"
 #~ msgstr " 証明書 ID 0x%08lXを用います\n"
diff --git a/po/nb.po b/po/nb.po
index 6f80570a5..b9e64c081 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -409,14 +409,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "valg kontrollsum-algoritme er ugyldig\n"
 
 #, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "Merk: standardvalg-fil «%s» finnes ikke\n"
-
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "valgfil «%s»: %s\n"
-
-#, c-format
 msgid "reading options from '%s'\n"
 msgstr "leser valg fra «%s»\n"
 
@@ -1023,9 +1015,27 @@ msgstr "ugyldig kommando"
 msgid "invalid alias definition"
 msgstr "ugyldig aliasdefinisjon"
 
+msgid "permission error"
+msgstr ""
+
 msgid "out of core"
 msgstr "kjernen er full"
 
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "ugyldig kommando"
+
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "«%s» er en ukjent kommando\n"
+
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "uforventet armering: "
+
 msgid "invalid option"
 msgstr "ugyldig valg"
 
@@ -1054,14 +1064,22 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr "kommandoen «%.50s» er flertydig\n"
 
 #, c-format
-msgid "out of core\n"
-msgstr "kjernen er full\n"
-
-#, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "valget «%.50s» er ugyldig\n"
 
 #, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Merk: standardvalg-fil «%s» finnes ikke\n"
+
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "valgfil «%s»: %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "konvertering fra «%s» til «%s» er ikke tilgjengelig\n"
 
@@ -6734,6 +6752,10 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "kontrollsum på %u bit er ugyldig for en %u-bit %s-nøkkel\n"
 
 #, c-format
+msgid "out of core\n"
+msgstr "kjernen er full\n"
+
+#, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(dette er algortime MD2)\n"
 
@@ -8762,154 +8784,129 @@ msgstr "Fant ikke komponent"
 msgid "No argument allowed"
 msgstr "Ingen argumenter tillatt"
 
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Bruk: gpg-check-pattern [valg] mønsterfil (-h for hjelp)\n"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"Kommandoer:\n"
-" "
-
-msgid "decryption modus"
-msgstr "dekrypteringsmodus"
+"Syntaks: gpg-check-pattern [valg] mønsterfil\n"
+"Kontroller passordfrase oppgitt på standard innkanal mot valgt mønsterfil\n"
 
-msgid "encryption modus"
-msgstr "krypteringsmodus"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Kommandoer:\n"
+#~ " "
 
-msgid "tool class (confucius)"
-msgstr "verktøyklasse (confucius)"
+#~ msgid "decryption modus"
+#~ msgstr "dekrypteringsmodus"
 
-msgid "program filename"
-msgstr "programfil-navn"
+#~ msgid "encryption modus"
+#~ msgstr "krypteringsmodus"
 
-msgid "secret key file (required)"
-msgstr "hemmelig nøkkelfil (påkrevet)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "verktøyklasse (confucius)"
 
-msgid "input file name (default stdin)"
-msgstr "inndata-filnavn (forvalgt: standard innkanal)"
+#~ msgid "program filename"
+#~ msgstr "programfil-navn"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Bruk: symcryptrun [valg] (-h for hjelp)"
+#~ msgid "secret key file (required)"
+#~ msgstr "hemmelig nøkkelfil (påkrevet)"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Syntaks: symcryptrun --class KLASSE --program PROGRAM --keyfile NØKKELFIL "
-"[valg …] KOMMANDO [inndatafil]\n"
-"Bruk et enkelt symmetrisk krypteringsverktøy\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "inndata-filnavn (forvalgt: standard innkanal)"
 
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s på %s avbrøt med status %i\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Bruk: symcryptrun [valg] (-h for hjelp)"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s på %s mislyktes med status %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Syntaks: symcryptrun --class KLASSE --program PROGRAM --keyfile NØKKELFIL "
+#~ "[valg …] KOMMANDO [inndatafil]\n"
+#~ "Bruk et enkelt symmetrisk krypteringsverktøy\n"
 
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "klarte ikke å lage midlertidig mappe «%s»: %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s på %s avbrøt med status %i\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "klarte ikke å åpne %s for skriving: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s på %s mislyktes med status %i\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "feil under skriving til %s: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "klarte ikke å lage midlertidig mappe «%s»: %s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "feil under lesing fra %s: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "klarte ikke å åpne %s for skriving: %s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "feil under lukking av %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "feil under skriving til %s: %s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "valget «--program» er ikke brukt\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "feil under lesing fra %s: %s\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "programmet støtter bare «--decrypt» og «--encrypt»\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "feil under lukking av %s: %s\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "valget «--keyfile» mangler\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "valget «--program» er ikke brukt\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "klarte ikke å tildele argumentvektor\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "programmet støtter bare «--decrypt» og «--encrypt»\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "klarte ikke å lage datarør: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "valget «--keyfile» mangler\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "klarte ikke å lage pty: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "klarte ikke å tildele argumentvektor\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "klarte ikke å lage underprosess: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "klarte ikke å lage datarør: %s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "«execv» mislyktes: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "klarte ikke å lage pty: %s\n"
 
-#, c-format
-msgid "select failed: %s\n"
-msgstr "«select» mislyktes: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "klarte ikke å lage underprosess: %s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "«read» mislyktes: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "«execv» mislyktes: %s\n"
 
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "«pty»-lesing mislyktes: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "«select» mislyktes: %s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "«waitpid» mislyktes: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "«read» mislyktes: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "underprosess ble avbrutt med status %i\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "«pty»-lesing mislyktes: %s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "klarte ikke å tildele inndatafil-streng: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "«waitpid» mislyktes: %s\n"
 
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "klarte ikke å tildele utdatafil-streng: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "underprosess ble avbrutt med status %i\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "du må velge enten %s eller %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "klarte ikke å tildele inndatafil-streng: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr "ingen klasse valgt\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "klarte ikke å tildele utdatafil-streng: %s\n"
 
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "klassen %s støttes ikke\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "du må velge enten %s eller %s\n"
 
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Bruk: gpg-check-pattern [valg] mønsterfil (-h for hjelp)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "ingen klasse valgt\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Syntaks: gpg-check-pattern [valg] mønsterfil\n"
-"Kontroller passordfrase oppgitt på standard innkanal mot valgt mønsterfil\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "klassen %s støttes ikke\n"
 
 #~ msgid " using certificate ID 0x%08lX\n"
 #~ msgstr " ved bruk av sertifikat-ID 0x%08lX\n"
diff --git a/po/pl.po b/po/pl.po
index 8706f1ad7..a0b57a904 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -403,14 +403,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
 
 #, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "Uwaga: brak domyślnego pliku opcji ,,%s''\n"
-
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "plik opcji ,,%s'': %s\n"
-
-#, c-format
 msgid "reading options from '%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
@@ -1014,9 +1006,27 @@ msgstr "błędne polecenie"
 msgid "invalid alias definition"
 msgstr "błędna definicja aliasu"
 
+msgid "permission error"
+msgstr ""
+
 msgid "out of core"
 msgstr "brak pamięci"
 
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "błędne polecenie"
+
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "nieznane polecenie ,,%s''\n"
+
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "nieoczekiwane opakowanie: "
+
 msgid "invalid option"
 msgstr "błędna opcja"
 
@@ -1045,14 +1055,22 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr "polecenie ,,%.50s'' jest niejednoznaczne\n"
 
 #, c-format
-msgid "out of core\n"
-msgstr "brak pamięci\n"
-
-#, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "błędna opcja ,,%.50s''\n"
 
 #, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Uwaga: brak domyślnego pliku opcji ,,%s''\n"
+
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "plik opcji ,,%s'': %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "konwersja z ,,%s'' do ,,%s'' niedostępna\n"
 
@@ -2973,12 +2991,15 @@ msgstr "błąd przydzielania pamięci: %s\n"
 
 #, c-format
 msgid "can't check signature with unsupported public-key algorithm (%d): %s.\n"
-msgstr "nie można sprawdzić podpisu z nieobsługiwanym algorytmem klucza publicznego (%d): %s.\n"
+msgstr ""
+"nie można sprawdzić podpisu z nieobsługiwanym algorytmem klucza publicznego "
+"(%d): %s.\n"
 
 #, c-format
 msgid ""
 "can't check signature with unsupported message-digest algorithm %d: %s.\n"
-msgstr "nie można sprawdzić podpisu z nieobsługiwanym algorytmem skrótu %d: %s.\n"
+msgstr ""
+"nie można sprawdzić podpisu z nieobsługiwanym algorytmem skrótu %d: %s.\n"
 
 msgid " (reordered signatures follow)"
 msgstr " (poniżej uporządkowane podpisy)"
@@ -3020,7 +3041,8 @@ msgid ""
 "Warning: errors found and only checked self-signatures, run '%s' to check "
 "all signatures.\n"
 msgstr ""
-"Uwaga: znaleziono błędy, a sprawdzono tylko podpisy własne; uruchomienie '%s' sprawdzi wszystkie podpisy.\n"
+"Uwaga: znaleziono błędy, a sprawdzono tylko podpisy własne; uruchomienie "
+"'%s' sprawdzi wszystkie podpisy.\n"
 
 #, c-format
 msgid "error creating keybox '%s': %s\n"
@@ -6834,6 +6856,10 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "skrót %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
 
 #, c-format
+msgid "out of core\n"
+msgstr "brak pamięci\n"
+
+#, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(to jest algorytm MD2)\n"
 
@@ -8873,152 +8899,127 @@ msgstr "Nie znaleziono komponentu"
 msgid "No argument allowed"
 msgstr "Argument nie jest dozwolony"
 
-msgid ""
-"@\n"
-"Commands:\n"
-" "
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 msgstr ""
-"@\n"
-"Polecenia:\n"
-" "
+"Składnia: gpg-check-pattern [opcje] plik-wzorców (-h wyświetla pomoc)\n"
 
-msgid "decryption modus"
-msgstr "tryb rozszyfrowywania"
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+"Składnia: gpg-check-pattern [opcje] plik-wzorców\n"
+"Sprawdzanie hasła ze standardowego wejścia względem pliku wzorców\n"
 
-msgid "encryption modus"
-msgstr "tryb szyfrowania"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Polecenia:\n"
+#~ " "
 
-msgid "tool class (confucius)"
-msgstr "klasa narzędzia (confucius)"
+#~ msgid "decryption modus"
+#~ msgstr "tryb rozszyfrowywania"
 
-msgid "program filename"
-msgstr "nazwa programu"
+#~ msgid "encryption modus"
+#~ msgstr "tryb szyfrowania"
 
-msgid "secret key file (required)"
-msgstr "plik klucza tajnego (wymagany)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "klasa narzędzia (confucius)"
 
-msgid "input file name (default stdin)"
-msgstr "nazwa pliku wejściowego (domyślnie standardowe wejście)"
+#~ msgid "program filename"
+#~ msgstr "nazwa programu"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Składnia: symcryptrun [opcje] (-h wyświetla pomoc)"
+#~ msgid "secret key file (required)"
+#~ msgstr "plik klucza tajnego (wymagany)"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Składnia: symcryptrun --class KLASA --program PROGRAM --keyfile PLIK_KLUCZA "
-"[opcje...] POLECENIE [plik-weściowy]\n"
-"Wywołanie prostego narzędzia do szyfrowania symetrycznego\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "nazwa pliku wejściowego (domyślnie standardowe wejście)"
 
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s na %s przerwany ze stanem %i\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Składnia: symcryptrun [opcje] (-h wyświetla pomoc)"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s na %s nie powiódł się ze stanem %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Składnia: symcryptrun --class KLASA --program PROGRAM --keyfile "
+#~ "PLIK_KLUCZA [opcje...] POLECENIE [plik-weściowy]\n"
+#~ "Wywołanie prostego narzędzia do szyfrowania symetrycznego\n"
 
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "nie można utworzyć katalogu tymczasowego ,,%s'': %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s na %s przerwany ze stanem %i\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "nie udało się otworzyć %s do zapisu: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s na %s nie powiódł się ze stanem %i\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "błąd zapisu do %s: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "nie można utworzyć katalogu tymczasowego ,,%s'': %s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "błąd odczytu z %s: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "nie udało się otworzyć %s do zapisu: %s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "błąd zamykania %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "błąd zapisu do %s: %s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "nie podano opcji --program\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "błąd odczytu z %s: %s\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "obsługiwane są tylko --decrypt i --encrypt\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "błąd zamykania %s: %s\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "nie podano opcji --keyfile\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "nie podano opcji --program\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "nie można przydzielić wektora args\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "obsługiwane są tylko --decrypt i --encrypt\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "nie udało się utworzyć potoku: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "nie podano opcji --keyfile\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "nie udało się utworzyć pty: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "nie można przydzielić wektora args\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "nie udało się wykonać fork: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "nie udało się utworzyć potoku: %s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv nie powiodło się: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "nie udało się utworzyć pty: %s\n"
 
-#, c-format
-msgid "select failed: %s\n"
-msgstr "select nie powiodło się: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "nie udało się wykonać fork: %s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "odczyt nie powiódł się: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv nie powiodło się: %s\n"
 
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "odczyt pty nie powiódł się: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "select nie powiodło się: %s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid nie powiodło się: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "odczyt nie powiódł się: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "potomek został przerwany ze stanem %i\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "odczyt pty nie powiódł się: %s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "nie można przydzielić łańcucha pliku wejściowego: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid nie powiodło się: %s\n"
 
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "nie można przydzielić łańcucha pliku wyjściowego: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "potomek został przerwany ze stanem %i\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "musi być podane %s lub %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "nie można przydzielić łańcucha pliku wejściowego: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr "nie podano klasy\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "nie można przydzielić łańcucha pliku wyjściowego: %s\n"
 
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "klasa %s nie jest obsługiwana\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "musi być podane %s lub %s\n"
 
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr ""
-"Składnia: gpg-check-pattern [opcje] plik-wzorców (-h wyświetla pomoc)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "nie podano klasy\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Składnia: gpg-check-pattern [opcje] plik-wzorców\n"
-"Sprawdzanie hasła ze standardowego wejścia względem pliku wzorców\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "klasa %s nie jest obsługiwana\n"
diff --git a/po/pt.po b/po/pt.po
index e0d74027f..ba6c7ce56 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -432,16 +432,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
 
 #, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "NOTA: ficheiro de opções por omissão `%s' inexistente\n"
-
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "ficheiro de opções `%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "a ler opções de `%s'\n"
@@ -1079,11 +1069,27 @@ msgstr "comandos em conflito\n"
 msgid "invalid alias definition"
 msgstr "opções de importação inválidas\n"
 
+msgid "permission error"
+msgstr ""
+
 #, fuzzy
 msgid "out of core"
 msgstr "não processado"
 
 #, fuzzy
+msgid "invalid meta command"
+msgstr "comandos em conflito\n"
+
+#, fuzzy
+msgid "unknown meta command"
+msgstr "destinatário por omissão desconhecido `%s'\n"
+
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "dados inesperados"
+
+#, fuzzy
 msgid "invalid option"
 msgstr "opções de importação inválidas\n"
 
@@ -1112,14 +1118,24 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "out of core\n"
-msgstr "não processado"
-
-#, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opções de importação inválidas\n"
 
 #, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "NOTA: ficheiro de opções por omissão `%s' inexistente\n"
+
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "ficheiro de opções `%s': %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "criação de armadura falhou: %s\n"
 
@@ -7013,6 +7029,10 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "não processado"
+
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
@@ -9107,153 +9127,106 @@ msgid "No argument allowed"
 msgstr "a escrever chave privada para `%s'\n"
 
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Comandos:\n"
-" "
 
 #, fuzzy
-msgid "decryption modus"
-msgstr "decifragem correcta\n"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Comandos:\n"
+#~ " "
 
 #, fuzzy
-msgid "encryption modus"
-msgstr "decifragem correcta\n"
-
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "decifragem correcta\n"
 
 #, fuzzy
-msgid "program filename"
-msgstr "--store [nome_do_ficheiro]"
-
-msgid "secret key file (required)"
-msgstr ""
-
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "encryption modus"
+#~ msgstr "decifragem correcta\n"
 
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
-
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s não é permitido com %s!\n"
-
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "impossível abrir %s: %s\n"
-
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "%s: impossível criar directoria: %s\n"
-
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "impossível abrir %s: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "erro na escrita do porta-chaves `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "erro na leitura de `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "erro na leitura de `%s': %s\n"
-
-#, c-format
-msgid "no --program option provided\n"
-msgstr ""
-
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#~ msgid "program filename"
+#~ msgstr "--store [nome_do_ficheiro]"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s não é permitido com %s!\n"
 
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "impossível criar %s: %s\n"
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "impossível abrir %s: %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "impossível criar %s: %s\n"
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "%s: impossível criar directoria: %s\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "impossível abrir %s: %s\n"
 
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "actualização falhou: %s\n"
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "remoção do bloco de chave falhou: %s\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "erro na leitura de `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "actualização falhou: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "erro na leitura de `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "actualização falhou: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "impossível criar %s: %s\n"
 
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "actualização falhou: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "impossível criar %s: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "actualização falhou: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "impossível criar `%s': %s\n"
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "remoção do bloco de chave falhou: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "impossível criar `%s': %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "actualização falhou: %s\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "actualização falhou: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "actualização falhou: %s\n"
 
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "algoritmo de protecção %d%s não é suportado\n"
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "impossível criar `%s': %s\n"
 
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "impossível criar `%s': %s\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid "class %s is not supported\n"
+#~ msgstr "algoritmo de protecção %d%s não é suportado\n"
 
 #, fuzzy
 #~ msgid " using certificate ID 0x%08lX\n"
@@ -10427,9 +10400,6 @@ msgstr ""
 #~ msgid "file delete error"
 #~ msgstr "erro na remoção do ficheiro"
 
-#~ msgid "unexpected data"
-#~ msgstr "dados inesperados"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "conflito de \"timestamp\""
 
diff --git a/po/ro.po b/po/ro.po
index c46e81962..e8b053245 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -442,16 +442,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
 #, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "NOTĂ: nici un fişier opţiuni implicit `%s'\n"
-
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "fişier opţiuni `%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "citesc opţiuni din `%s'\n"
@@ -1098,11 +1088,27 @@ msgstr "Comandă numai-administrare\n"
 msgid "invalid alias definition"
 msgstr "opţiuni enumerare invalide\n"
 
+msgid "permission error"
+msgstr ""
+
 #, fuzzy
 msgid "out of core"
 msgstr "neforţat(ă)"
 
 #, fuzzy
+msgid "invalid meta command"
+msgstr "Comandă numai-administrare\n"
+
+#, fuzzy
+msgid "unknown meta command"
+msgstr "opţiune necunoscută `%s'\n"
+
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "date neaşteptate"
+
+#, fuzzy
 msgid "invalid option"
 msgstr "opţiuni enumerare invalide\n"
 
@@ -1131,14 +1137,24 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "out of core\n"
-msgstr "neforţat(ă)"
-
-#, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "opţiuni enumerare invalide\n"
 
 #, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "NOTĂ: nici un fişier opţiuni implicit `%s'\n"
+
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "fişier opţiuni `%s': %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "redenumirea `%s' ca `%s' a eşuat: %s\n"
 
@@ -7112,6 +7128,10 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "neforţat(ă)"
+
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
@@ -9236,153 +9256,110 @@ msgid "No argument allowed"
 msgstr "Nu sunt permise comenzi administrare\n"
 
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Comenzi:\n"
-" "
 
 #, fuzzy
-msgid "decryption modus"
-msgstr "decriptare OK\n"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Comenzi:\n"
+#~ " "
 
 #, fuzzy
-msgid "encryption modus"
-msgstr "decriptare OK\n"
-
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "decriptare OK\n"
 
 #, fuzzy
-msgid "program filename"
-msgstr "--store [nume_fişier]"
-
-msgid "secret key file (required)"
-msgstr ""
-
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "encryption modus"
+#~ msgstr "decriptare OK\n"
 
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
-
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s nu este permis cu %s!\n"
-
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "fstat pentru `%s' a eşuat în %s: %s\n"
-
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "nu pot crea directorul `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "nu pot deschide %s: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "eroare la scrierea inelului de chei `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "eroare la citire `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "eroare în `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "nu este suportată execuţia nici unui program la distanţă\n"
+#~ msgid "program filename"
+#~ msgstr "--store [nume_fişier]"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s nu este permis cu %s!\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "fstat pentru `%s' a eşuat în %s: %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "nu pot crea `%s': %s\n"
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "nu pot crea directorul `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "nu pot crea `%s': %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "nu pot deschide %s: %s\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "actualizarea a eşuat: %s\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "eroare la citire `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "stergere keyblock a eşuat: %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "eroare în `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "actualizarea a eşuat: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "nu este suportată execuţia nici unui program la distanţă\n"
 
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "actualizarea a eşuat: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "nu pot crea `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "actualizarea a eşuat: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "nu pot crea `%s': %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "actualizarea a eşuat: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "nu pot deschide fişierul: %s\n"
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "stergere keyblock a eşuat: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "nu pot crea fişier de rezervă `%s': %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "actualizarea a eşuat: %s\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "actualizarea a eşuat: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "actualizarea a eşuat: %s\n"
 
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "algoritm rezumat %d nu este suportat\n"
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "nu pot deschide fişierul: %s\n"
 
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "nu pot crea fişier de rezervă `%s': %s\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid "class %s is not supported\n"
+#~ msgstr "algoritm rezumat %d nu este suportat\n"
 
 #, fuzzy
 #~ msgid " using certificate ID 0x%08lX\n"
@@ -10647,9 +10624,6 @@ msgstr ""
 #~ msgid "file delete error"
 #~ msgstr "eroare ştergere fişier"
 
-#~ msgid "unexpected data"
-#~ msgstr "date neaşteptate"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "conflict timestamp"
 
diff --git a/po/ru.po b/po/ru.po
index d522a213f..2249b63c4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -414,14 +414,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана недопустимая хеш-функция\n"
 
 #, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "Замечание: основной файл параметров '%s' не обнаружен\n"
-
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "файл параметров '%s': %s\n"
-
-#, c-format
 msgid "reading options from '%s'\n"
 msgstr "чтение параметров из '%s'\n"
 
@@ -1023,9 +1015,27 @@ msgstr "недопустимая команда"
 msgid "invalid alias definition"
 msgstr "недопустимое определение синонима"
 
+msgid "permission error"
+msgstr ""
+
 msgid "out of core"
 msgstr "нехватка выделенной памяти"
 
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "недопустимая команда"
+
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "неизвестная команда '%s'\n"
+
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "неожиданный текстовый формат: "
+
 msgid "invalid option"
 msgstr "недопустимый параметр"
 
@@ -1054,14 +1064,22 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr "команда \"%.50s\" неоднозначна\n"
 
 #, c-format
-msgid "out of core\n"
-msgstr "нехватка выделенной памяти\n"
-
-#, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "недопустимый параметр \"%.50s\"\n"
 
 #, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "Замечание: основной файл параметров '%s' не обнаружен\n"
+
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "файл параметров '%s': %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "преобразование из '%s' в '%s' недоступно\n"
 
@@ -6800,6 +6818,10 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u-битный хеш недопустим для %u-битного ключа %s\n"
 
 #, c-format
+msgid "out of core\n"
+msgstr "нехватка выделенной памяти\n"
+
+#, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(это алгоритм MD2)\n"
 
@@ -8857,154 +8879,129 @@ msgstr "Компонент не найден"
 msgid "No argument allowed"
 msgstr "Аргументы не разрешены"
 
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Вызов: gpg-check-pattern [параметры] файл_образцов (-h - подсказка)\n"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"Команды:\n"
-" "
+"Синтаксис: gpg-check-pattern [параметры] файл_образцов\n"
+"Проверить фразу-пароль, поступающую из stdin, по файлу образцов\n"
 
-msgid "decryption modus"
-msgstr "режим расшифровки"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Команды:\n"
+#~ " "
 
-msgid "encryption modus"
-msgstr "режим зашифровывания"
+#~ msgid "decryption modus"
+#~ msgstr "режим расшифровки"
 
-msgid "tool class (confucius)"
-msgstr "класс средства (confucius)"
+#~ msgid "encryption modus"
+#~ msgstr "режим зашифровывания"
 
-msgid "program filename"
-msgstr "имя файла программы"
+#~ msgid "tool class (confucius)"
+#~ msgstr "класс средства (confucius)"
 
-msgid "secret key file (required)"
-msgstr "файл секретного ключа (обязателен)"
+#~ msgid "program filename"
+#~ msgstr "имя файла программы"
 
-msgid "input file name (default stdin)"
-msgstr "имя входного файла (по умолчанию stdin)"
+#~ msgid "secret key file (required)"
+#~ msgstr "файл секретного ключа (обязателен)"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Вызов: symcryptrun [параметры] (-h - подсказка)"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "имя входного файла (по умолчанию stdin)"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Синтаксис: symcryptrun --class КЛАСС --program ПРОГРАММА --keyfile "
-"ФАЙЛ_КЛЮЧА [параметры...] КОМАНДА [входной файл]\n"
-"Вызывает простое средство шифрования\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Вызов: symcryptrun [параметры] (-h - подсказка)"
 
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s над %s прервано, статус %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Синтаксис: symcryptrun --class КЛАСС --program ПРОГРАММА --keyfile "
+#~ "ФАЙЛ_КЛЮЧА [параметры...] КОМАНДА [входной файл]\n"
+#~ "Вызывает простое средство шифрования\n"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "сбой %s над %s, статус %i\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s над %s прервано, статус %i\n"
 
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "не могу создать временный каталог '%s': %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "сбой %s над %s, статус %i\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "невозможно открыть %s на запись: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "не могу создать временный каталог '%s': %s\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "ошибка записи в %s: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "невозможно открыть %s на запись: %s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "ошибка чтения из %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "ошибка записи в %s: %s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "ошибка закрытия %s: %s\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "ошибка чтения из %s: %s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "не задан параметр --program\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "ошибка закрытия %s: %s\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "поддерживаются только параметры --decrypt и --encrypt\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "не задан параметр --program\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "не задан параметр --keyfile\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "поддерживаются только параметры --decrypt и --encrypt\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "невозможно выделить память под вектор аргументов\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "не задан параметр --keyfile\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "сбой при создании канала конвейера: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "невозможно выделить память под вектор аргументов\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "сбой при создании псевдотерминала: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "сбой при создании канала конвейера: %s\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "сбой при дублировании процесса: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "сбой при создании псевдотерминала: %s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "сбой execv: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "сбой при дублировании процесса: %s\n"
 
-#, c-format
-msgid "select failed: %s\n"
-msgstr "сбой select: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "сбой execv: %s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "сбой чтения: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "сбой select: %s\n"
 
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "сбой чтения из псевдотерминала: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "сбой чтения: %s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "сбой waitpid: %s\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "сбой чтения из псевдотерминала: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "потомок завершился, статус %i\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "сбой waitpid: %s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "сбой при выделении памяти под имя входного файла: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "потомок завершился, статус %i\n"
 
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "сбой при выделении памяти под имя выходного файла: %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "сбой при выделении памяти под имя входного файла: %s\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "следует задать %s либо %s\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "сбой при выделении памяти под имя выходного файла: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr "не задан класс\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "следует задать %s либо %s\n"
 
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "класс %s не поддерживается\n"
+#~ msgid "no class provided\n"
+#~ msgstr "не задан класс\n"
 
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Вызов: gpg-check-pattern [параметры] файл_образцов (-h - подсказка)\n"
-
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Синтаксис: gpg-check-pattern [параметры] файл_образцов\n"
-"Проверить фразу-пароль, поступающую из stdin, по файлу образцов\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "класс %s не поддерживается\n"
 
 #~ msgid " using certificate ID 0x%08lX\n"
 #~ msgstr " с помощью сертификата с идентификатором 0x%08lX\n"
diff --git a/po/sk.po b/po/sk.po
index a1e12cded..462aba541 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -432,16 +432,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
 #, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "POZNÁMKA: neexistuje implicitný súbor s možnosťami `%s'\n"
-
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "súbor s možnosťami `%s': %s\n"
-
-#, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "čítam možnosti z `%s'\n"
@@ -1079,11 +1069,27 @@ msgstr "konfliktné príkazy\n"
 msgid "invalid alias definition"
 msgstr "neplatný parameter pre import\n"
 
+msgid "permission error"
+msgstr ""
+
 #, fuzzy
 msgid "out of core"
 msgstr "nespracované"
 
 #, fuzzy
+msgid "invalid meta command"
+msgstr "konfliktné príkazy\n"
+
+#, fuzzy
+msgid "unknown meta command"
+msgstr "neznámy implicitný adresát `%s'\n"
+
+#, fuzzy
+#| msgid "unexpected data"
+msgid "unexpected meta command"
+msgstr "neočakávané dáta"
+
+#, fuzzy
 msgid "invalid option"
 msgstr "neplatný parameter pre import\n"
 
@@ -1112,14 +1118,24 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "out of core\n"
-msgstr "nespracované"
-
-#, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "neplatný parameter pre import\n"
 
 #, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "POZNÁMKA: neexistuje implicitný súbor s možnosťami `%s'\n"
+
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "súbor s možnosťami `%s': %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, fuzzy, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
@@ -7046,6 +7062,10 @@ msgstr ""
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "out of core\n"
+msgstr "nespracované"
+
 #, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
@@ -9139,153 +9159,110 @@ msgid "No argument allowed"
 msgstr "zapisujem tajný kľúč do `%s'\n"
 
 #, fuzzy
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@Príkazy:\n"
-" "
 
 #, fuzzy
-msgid "decryption modus"
-msgstr "dešifrovanie o.k.\n"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@Príkazy:\n"
+#~ " "
 
 #, fuzzy
-msgid "encryption modus"
-msgstr "dešifrovanie o.k.\n"
-
-msgid "tool class (confucius)"
-msgstr ""
+#~ msgid "decryption modus"
+#~ msgstr "dešifrovanie o.k.\n"
 
 #, fuzzy
-msgid "program filename"
-msgstr "--store [meno súboru]"
-
-msgid "secret key file (required)"
-msgstr ""
-
-msgid "input file name (default stdin)"
-msgstr ""
+#~ msgid "encryption modus"
+#~ msgstr "dešifrovanie o.k.\n"
 
 #, fuzzy
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
-
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-
-#, fuzzy, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "Nie je dovolené používať %s s %s!\n"
-
-#, fuzzy, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "nemožno otvoriť súbor: %s\n"
-
-#, fuzzy, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "nemôžem vytvoriť adresár `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "nemožno otvoriť %s: %s\n"
-
-#, fuzzy, c-format
-msgid "error writing to %s: %s\n"
-msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "error reading from %s: %s\n"
-msgstr "chyba pri čítaní `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "error closing %s: %s\n"
-msgstr "chyba pri čítaní `%s': %s\n"
-
-#, fuzzy, c-format
-msgid "no --program option provided\n"
-msgstr "žiadne vzialené vykonávanie programu nie je podporované\n"
+#~ msgid "program filename"
+#~ msgstr "--store [meno súboru]"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "Nie je dovolené používať %s s %s!\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr ""
+#, fuzzy
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "nemožno otvoriť súbor: %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pipe: %s\n"
-msgstr "%s: nemôžem vytvoriť: %s\n"
+#, fuzzy
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "could not create pty: %s\n"
-msgstr "%s: nemôžem vytvoriť: %s\n"
+#, fuzzy
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "nemožno otvoriť %s: %s\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr ""
+#, fuzzy
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "chyba pri zápise súboru kľúčov (keyring)  `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "execv failed: %s\n"
-msgstr "aktualizácia zlyhala: %s\n"
+#, fuzzy
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "chyba pri čítaní `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "select failed: %s\n"
-msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
+#, fuzzy
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "chyba pri čítaní `%s': %s\n"
 
-#, fuzzy, c-format
-msgid "read failed: %s\n"
-msgstr "aktualizácia zlyhala: %s\n"
+#, fuzzy
+#~ msgid "no --program option provided\n"
+#~ msgstr "žiadne vzialené vykonávanie programu nie je podporované\n"
 
-#, fuzzy, c-format
-msgid "pty read failed: %s\n"
-msgstr "aktualizácia zlyhala: %s\n"
+#, fuzzy
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#, fuzzy, c-format
-msgid "waitpid failed: %s\n"
-msgstr "aktualizácia zlyhala: %s\n"
+#, fuzzy
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr ""
+#, fuzzy
+#~ msgid "execv failed: %s\n"
+#~ msgstr "aktualizácia zlyhala: %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "nemôžem vytvoriť `%s': %s\n"
+#, fuzzy
+#~ msgid "select failed: %s\n"
+#~ msgstr "zmazanie bloku kľúča sa nepodarilo:  %s\n"
 
-#, fuzzy, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "nemôžem vytvoriť `%s': %s\n"
+#, fuzzy
+#~ msgid "read failed: %s\n"
+#~ msgstr "aktualizácia zlyhala: %s\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr ""
+#, fuzzy
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "aktualizácia zlyhala: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr ""
+#, fuzzy
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "aktualizácia zlyhala: %s\n"
 
-#, fuzzy, c-format
-msgid "class %s is not supported\n"
-msgstr "ochranný algoritmus %d%s nie je podporováný\n"
+#, fuzzy
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "nemôžem vytvoriť `%s': %s\n"
 
 #, fuzzy
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "nemôžem vytvoriť `%s': %s\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
+#, fuzzy
+#~ msgid "class %s is not supported\n"
+#~ msgstr "ochranný algoritmus %d%s nie je podporováný\n"
 
 #, fuzzy
 #~ msgid " using certificate ID 0x%08lX\n"
@@ -10489,9 +10466,6 @@ msgstr ""
 #~ msgid "file delete error"
 #~ msgstr "chyba pri mazaní súboru"
 
-#~ msgid "unexpected data"
-#~ msgstr "neočakávané dáta"
-
 #~ msgid "timestamp conflict"
 #~ msgstr "konflikt časového razítka"
 
diff --git a/po/sv.po b/po/sv.po
index 68dbe8a21..33af34aa5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -485,16 +485,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
 #, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "OBS: inställningsfilen \"%s\" saknas\n"
-
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "inställningsfil \"%s\": %s\n"
-
-#, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
@@ -1146,9 +1136,27 @@ msgstr "ogiltigt kommando"
 msgid "invalid alias definition"
 msgstr "ogiltig aliasdefinition"
 
+msgid "permission error"
+msgstr ""
+
 msgid "out of core"
 msgstr "slut på minne"
 
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "ogiltigt kommando"
+
+#, fuzzy
+#| msgid "unknown command `%s'\n"
+msgid "unknown meta command"
+msgstr "okänt kommando \"%s\"\n"
+
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "oväntat skal: "
+
 msgid "invalid option"
 msgstr "ogiltig flagga"
 
@@ -1178,14 +1186,24 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr "kommandot \"%.50s\" är tvetydigt\n"
 
 #, c-format
-msgid "out of core\n"
-msgstr "slut på minne\n"
-
-#, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "ogiltig flagga \"%.50s\"\n"
 
 #, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "OBS: inställningsfilen \"%s\" saknas\n"
+
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "inställningsfil \"%s\": %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' not available\n"
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "konvertering från \"%s\" till \"%s\" är inte tillgänglig\n"
@@ -7299,6 +7317,10 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "en %u-bitars hash är inte giltig för en %u-bitars %s-nyckel\n"
 
 #, c-format
+msgid "out of core\n"
+msgstr "slut på minne\n"
+
+#, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(det här är MD2-algoritmen)\n"
 
@@ -9614,157 +9636,133 @@ msgstr "Komponenten hittades inte"
 msgid "No argument allowed"
 msgstr "Inget argument tillåts"
 
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "Användning: gpg-check-pattern [flaggor] mönsterfil (-h för hjälp)\n"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"Kommandon:\n"
-" "
+"Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
+"Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
 
-msgid "decryption modus"
-msgstr "dekrypteringsmodus"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Kommandon:\n"
+#~ " "
 
-msgid "encryption modus"
-msgstr "krypteringsmodus"
+#~ msgid "decryption modus"
+#~ msgstr "dekrypteringsmodus"
 
-msgid "tool class (confucius)"
-msgstr "verktygsklass (confucius)"
+#~ msgid "encryption modus"
+#~ msgstr "krypteringsmodus"
 
-msgid "program filename"
-msgstr "programfilnamn"
+#~ msgid "tool class (confucius)"
+#~ msgstr "verktygsklass (confucius)"
 
-msgid "secret key file (required)"
-msgstr "hemlig nyckelfil (krävs)"
+#~ msgid "program filename"
+#~ msgstr "programfilnamn"
 
-msgid "input file name (default stdin)"
-msgstr "filnamn för inmatning (standardvärde är standard in)"
+#~ msgid "secret key file (required)"
+#~ msgstr "hemlig nyckelfil (krävs)"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Användning: symcryptrun [flaggor] (-h för hjälp)"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "filnamn för inmatning (standardvärde är standard in)"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Syntax: symcryptrun --class KLASS --program PROGRAM --keyfile NYCKELFIL "
-"[flaggor...] KOMMANDO [inmatningsfil]\n"
-"Anropa ett enkelt symmetriskt krypteringsverktyg\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Användning: symcryptrun [flaggor] (-h för hjälp)"
 
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s på %s avbröts med status %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Syntax: symcryptrun --class KLASS --program PROGRAM --keyfile NYCKELFIL "
+#~ "[flaggor...] KOMMANDO [inmatningsfil]\n"
+#~ "Anropa ett enkelt symmetriskt krypteringsverktyg\n"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s på %s misslyckades med status %i\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s på %s avbröts med status %i\n"
 
-#, fuzzy, c-format
-#| msgid "can't create temporary directory `%s': %s\n"
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "kan inte skapa temporärkatalogen \"%s\": %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s på %s misslyckades med status %i\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "kunde inte öppna %s för skrivning: %s\n"
+#, fuzzy
+#~| msgid "can't create temporary directory `%s': %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "kan inte skapa temporärkatalogen \"%s\": %s\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "fel vid skrivning till %s: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "kunde inte öppna %s för skrivning: %s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "fel vid läsning från %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "fel vid skrivning till %s: %s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "fel vid stängning av %s: %s\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "fel vid läsning från %s: %s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "flaggan --program angavs inte\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "fel vid stängning av %s: %s\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "endast --decrypt och --encrypt stöds\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "flaggan --program angavs inte\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "flaggan --keyfile angavs inte\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "endast --decrypt och --encrypt stöds\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "kan inte allokera argumentvektor\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "flaggan --keyfile angavs inte\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "kunde inte skapa rör: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "kan inte allokera argumentvektor\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "kunde inte skapa pty: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "kunde inte skapa rör: %s\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "kunde inte grena process: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "kunde inte skapa pty: %s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv misslyckades: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "kunde inte grena process: %s\n"
 
-#, c-format
-msgid "select failed: %s\n"
-msgstr "val misslyckades: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv misslyckades: %s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "läsning misslyckades: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "val misslyckades: %s\n"
 
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "pty-läsning misslyckades: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "läsning misslyckades: %s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid misslyckades: %s\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "pty-läsning misslyckades: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "barnprocess avbröts med status %i\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid misslyckades: %s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "kan inte allokera infilssträng: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "barnprocess avbröts med status %i\n"
 
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "kan inte allokera utfilssträng: %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "kan inte allokera infilssträng: %s\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "antingen %s eller %s måste anges\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "kan inte allokera utfilssträng: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr "ingen klass tillhandahölls\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "antingen %s eller %s måste anges\n"
+
+#~ msgid "no class provided\n"
+#~ msgstr "ingen klass tillhandahölls\n"
 
 # Skyddssammandraget låter underligt
 # Kontrollsumma?
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "klassen %s stöds inte\n"
-
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "Användning: gpg-check-pattern [flaggor] mönsterfil (-h för hjälp)\n"
-
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
-"Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "klassen %s stöds inte\n"
 
 #~ msgid " using certificate ID 0x%08lX\n"
 #~ msgstr " använder certifikat-id 0x%08lX\n"
diff --git a/po/tr.po b/po/tr.po
index 651d67153..3f5637c72 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -454,16 +454,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özet algoritması geçersiz\n"
 
 #, fuzzy, c-format
-#| msgid "NOTE: no default option file `%s'\n"
-msgid "Note: no default option file '%s'\n"
-msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
-
-#, fuzzy, c-format
-#| msgid "option file `%s': %s\n"
-msgid "option file '%s': %s\n"
-msgstr "seçenek dosyası \"%s\": %s\n"
-
-#, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
@@ -1118,9 +1108,27 @@ msgstr "geçersiz komut"
 msgid "invalid alias definition"
 msgstr "geçersiz rumuz tanımı"
 
+msgid "permission error"
+msgstr ""
+
 msgid "out of core"
 msgstr "nüve dışı"
 
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "geçersiz komut"
+
+#, fuzzy
+#| msgid "unknown command `%s'\n"
+msgid "unknown meta command"
+msgstr "komut `%s' bilinmiyor\n"
+
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "beklenmeyen zırh: "
+
 msgid "invalid option"
 msgstr "geçersiz seçenek"
 
@@ -1150,14 +1158,24 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr "\"%.50s\" komutu belirsiz\n"
 
 #, c-format
-msgid "out of core\n"
-msgstr "nüve dışında\n"
-
-#, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "geçersiz seçenekler \"%.50s\"\n"
 
 #, fuzzy, c-format
+#| msgid "NOTE: no default option file `%s'\n"
+msgid "Note: no default option file '%s'\n"
+msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
+
+#, fuzzy, c-format
+#| msgid "option file `%s': %s\n"
+msgid "option file '%s': %s\n"
+msgstr "seçenek dosyası \"%s\": %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' not available\n"
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "`%s' > `%s' dönüşümü elverişli değil\n"
@@ -7209,6 +7227,10 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u bitlik çittirim %u bitlik %s anahtarı için geçersiz\n"
 
 #, c-format
+msgid "out of core\n"
+msgstr "nüve dışında\n"
+
+#, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(bu, MD2 algoritmasıdır)\n"
 
@@ -9516,157 +9538,133 @@ msgstr "Bileşen yok"
 msgid "No argument allowed"
 msgstr "Değiştirgeye izin verilmez"
 
-msgid ""
-"@\n"
-"Commands:\n"
-" "
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 msgstr ""
-"@\n"
-"Komutlar:\n"
-" "
+"Kullanım: gpg-check-pattern [seçenekler] örüntüdosyası (yardım için -h)\n"
 
-msgid "decryption modus"
-msgstr "şifre çözme kipi"
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+"Kullanım: gpg-check-pattern [seçenekler] örüntüdosyası\n"
+"Standart girdiden verilen anahtar parolasını örüntü dosyasıyla "
+"karşılaştırır\n"
 
-msgid "encryption modus"
-msgstr "şifreleme kipi"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Komutlar:\n"
+#~ " "
 
-msgid "tool class (confucius)"
-msgstr "araç sınıfı (Konfüçyüs)"
+#~ msgid "decryption modus"
+#~ msgstr "şifre çözme kipi"
 
-msgid "program filename"
-msgstr "program dosyaismi"
+#~ msgid "encryption modus"
+#~ msgstr "şifreleme kipi"
 
-msgid "secret key file (required)"
-msgstr "gizli anahtar dosyası (gerekli)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "araç sınıfı (Konfüçyüs)"
 
-msgid "input file name (default stdin)"
-msgstr "girdi dosyası ismi (std girdi öntanımlı)"
+#~ msgid "program filename"
+#~ msgstr "program dosyaismi"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Kullanımı: symcryptrun [seçenekler] (yardım için -h)"
+#~ msgid "secret key file (required)"
+#~ msgstr "gizli anahtar dosyası (gerekli)"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Sözdizimi: symcryptrun --class SINIF --program PROGRAM --keyfile ANHDOSYA "
-"[seçenekler...] KOMUT [girdi-dosyası]\n"
-"Basit bir simetrik şifreleme aracı çalıştırır\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "girdi dosyası ismi (std girdi öntanımlı)"
 
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%2$s üzerindeki %1$s %3$i durumuyla çıktı\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Kullanımı: symcryptrun [seçenekler] (yardım için -h)"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%2$s üzerindeki %1$s %3$i durumuyla başarısız oldu\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Sözdizimi: symcryptrun --class SINIF --program PROGRAM --keyfile ANHDOSYA "
+#~ "[seçenekler...] KOMUT [girdi-dosyası]\n"
+#~ "Basit bir simetrik şifreleme aracı çalıştırır\n"
 
-#, fuzzy, c-format
-#| msgid "can't create temporary directory `%s': %s\n"
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "`%s' geçici dizini oluşturulamıyor: %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%2$s üzerindeki %1$s %3$i durumuyla çıktı\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "%s yazmak için açılamadı: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%2$s üzerindeki %1$s %3$i durumuyla başarısız oldu\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "%s yazılırken hata: %s\n"
+#, fuzzy
+#~| msgid "can't create temporary directory `%s': %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "`%s' geçici dizini oluşturulamıyor: %s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "%s okunurken hata: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "%s yazmak için açılamadı: %s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "%s kapanırken hata: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "%s yazılırken hata: %s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "--program diye bir seçenek yok\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "%s okunurken hata: %s\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "sadece --decrypt ve --encrypt destekleniyor\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "%s kapanırken hata: %s\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "--keyfile diye bir seçenek yok\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "--program diye bir seçenek yok\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "argüman dizgeleri dizisi ayrılamıyor\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "sadece --decrypt ve --encrypt destekleniyor\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "boru oluşturulamadı: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "--keyfile diye bir seçenek yok\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "pty oluşturulamadı: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "argüman dizgeleri dizisi ayrılamıyor\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "çatallanamadı: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "boru oluşturulamadı: %s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv başarısız: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "pty oluşturulamadı: %s\n"
 
-#, c-format
-msgid "select failed: %s\n"
-msgstr "select başarısız: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "çatallanamadı: %s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "read başarısız: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv başarısız: %s\n"
 
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "pty okuması başarısız: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "select başarısız: %s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid başarısız: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "read başarısız: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "alt süreç %i durumu ile çıktı\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "pty okuması başarısız: %s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "dosya içi dizge ayrılamıyor: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid başarısız: %s\n"
 
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "dosya dışı dizge ayrılamıyor: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "alt süreç %i durumu ile çıktı\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "ya %s verilmeli ya da %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "dosya içi dizge ayrılamıyor: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr "hiç sınıf sağlanmamış\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "dosya dışı dizge ayrılamıyor: %s\n"
 
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "%s sınıfı desteklenmiyor\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "ya %s verilmeli ya da %s\n"
 
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr ""
-"Kullanım: gpg-check-pattern [seçenekler] örüntüdosyası (yardım için -h)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "hiç sınıf sağlanmamış\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Kullanım: gpg-check-pattern [seçenekler] örüntüdosyası\n"
-"Standart girdiden verilen anahtar parolasını örüntü dosyasıyla "
-"karşılaştırır\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "%s sınıfı desteklenmiyor\n"
 
 #~ msgid " using certificate ID 0x%08lX\n"
 #~ msgstr " sertifika kimliği 0x%08lX kullanılarak yapıldı\n"
diff --git a/po/uk.po b/po/uk.po
index c2ff82a58..a1294cf29 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -410,14 +410,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "вибраний алгоритм побудови контрольних сум є некоректним\n"
 
 #, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
-
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "файл параметрів «%s»: %s\n"
-
-#, c-format
 msgid "reading options from '%s'\n"
 msgstr "прочитати параметри з «%s»\n"
 
@@ -1031,9 +1023,27 @@ msgstr "некоректна команда"
 msgid "invalid alias definition"
 msgstr "некоректне визначення замінника"
 
+msgid "permission error"
+msgstr ""
+
 msgid "out of core"
 msgstr "вихід за межі області пам’яті"
 
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "некоректна команда"
+
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "невідома команда «%s»\n"
+
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "неочікуваний формат ASCII: "
+
 msgid "invalid option"
 msgstr "некоректний параметр"
 
@@ -1062,14 +1072,22 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr "команда «%.50s» є неоднозначною\n"
 
 #, c-format
-msgid "out of core\n"
-msgstr "вихід за межі області пам’яті\n"
-
-#, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "некоректний параметр «%.50s»\n"
 
 #, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "ЗАУВАЖЕННЯ: не виявлено файла типових параметрів «%s»\n"
+
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "файл параметрів «%s»: %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "перетворення з «%s» у «%s» недоступне\n"
 
@@ -6907,6 +6925,10 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u-бітовий хеш не є коректним для %u-бітового ключа %s\n"
 
 #, c-format
+msgid "out of core\n"
+msgstr "вихід за межі області пам’яті\n"
+
+#, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(це алгоритм MD2)\n"
 
@@ -8960,155 +8982,130 @@ msgstr "Компонент не знайдено"
 msgid "No argument allowed"
 msgstr "Не можна вказувати аргументів"
 
-msgid ""
-"@\n"
-"Commands:\n"
-" "
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
 msgstr ""
-"@\n"
-"Команди:\n"
-" "
+"Використання: gpg-check-pattern [параметри] файл_шаблонів (-h — довідка)\n"
 
-msgid "decryption modus"
-msgstr "спосіб розшифрування"
+msgid ""
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
+msgstr ""
+"Синтаксис: gpg-check-pattern [параметри] файл_шаблонів\n"
+"Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
 
-msgid "encryption modus"
-msgstr "спосіб шифрування"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "Команди:\n"
+#~ " "
 
-msgid "tool class (confucius)"
-msgstr "клас інструмента (confucius)"
+#~ msgid "decryption modus"
+#~ msgstr "спосіб розшифрування"
 
-msgid "program filename"
-msgstr "назва файла програми"
+#~ msgid "encryption modus"
+#~ msgstr "спосіб шифрування"
 
-msgid "secret key file (required)"
-msgstr "файл закритого ключа (обов’язковий)"
+#~ msgid "tool class (confucius)"
+#~ msgstr "клас інструмента (confucius)"
 
-msgid "input file name (default stdin)"
-msgstr "назва файла виведених даних (типово stdin)"
+#~ msgid "program filename"
+#~ msgstr "назва файла програми"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "Використання: symcryptrun [параметри] (-h — довідка)"
+#~ msgid "secret key file (required)"
+#~ msgstr "файл закритого ключа (обов’язковий)"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"Синтаксис: symcryptrun --class КЛАС --program ПРОГРАМА --keyfile ФАЙЛ_КЛЮЧА "
-"[параметри...] КОМАНДА [файл_вхідних_даних]\n"
-"Виклик інструмента простого симетричного шифрування\n"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "назва файла виведених даних (типово stdin)"
 
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "перервано спробу виконання %s для %s зі станом %i\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "Використання: symcryptrun [параметри] (-h — довідка)"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "невдала спроба виконання %s для %s зі станом %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "Синтаксис: symcryptrun --class КЛАС --program ПРОГРАМА --keyfile "
+#~ "ФАЙЛ_КЛЮЧА [параметри...] КОМАНДА [файл_вхідних_даних]\n"
+#~ "Виклик інструмента простого симетричного шифрування\n"
 
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "не вдалося створити тимчасовий каталог «%s»: %s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "перервано спробу виконання %s для %s зі станом %i\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "не вдалося відкрити %s для запису: %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "невдала спроба виконання %s для %s зі станом %i\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "помилка під час запису до %s: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "не вдалося створити тимчасовий каталог «%s»: %s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "помилка читання з %s: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "не вдалося відкрити %s для запису: %s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "помилка під час спроби закрити %s: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "помилка під час запису до %s: %s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "не вказано параметра --program\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "помилка читання з %s: %s\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "передбачено підтримку лише --decrypt і --encrypt\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "помилка під час спроби закрити %s: %s\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "параметра --keyfile не передбачено\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "не вказано параметра --program\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "не вдалося розмістити у пам’яті вектор аргументів\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "передбачено підтримку лише --decrypt і --encrypt\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "не вдалося створити канал: %s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "параметра --keyfile не передбачено\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "не вдалося створити pty: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "не вдалося розмістити у пам’яті вектор аргументів\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "не вдалося створити відгалуження: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "не вдалося створити канал: %s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "помилка execv: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "не вдалося створити pty: %s\n"
 
-#, c-format
-msgid "select failed: %s\n"
-msgstr "помилка select: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "не вдалося створити відгалуження: %s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "помилка читання: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "помилка execv: %s\n"
 
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "помилка читання з pty: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "помилка select: %s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "помилка waitpid: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "помилка читання: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "дочірня підпрограма завершила роботу зі станом %i\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "помилка читання з pty: %s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "не вдалося розмістити у пам’яті рядок infile: %s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "помилка waitpid: %s\n"
 
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "не вдалося розмістити у пам’яті рядок outfile: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "дочірня підпрограма завершила роботу зі станом %i\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "має бути вказано %s або %s\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "не вдалося розмістити у пам’яті рядок infile: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr "не вказано клас\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "не вдалося розмістити у пам’яті рядок outfile: %s\n"
 
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "підтримки класу %s не передбачено\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "має бути вказано %s або %s\n"
 
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr ""
-"Використання: gpg-check-pattern [параметри] файл_шаблонів (-h — довідка)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "не вказано клас\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"Синтаксис: gpg-check-pattern [параметри] файл_шаблонів\n"
-"Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "підтримки класу %s не передбачено\n"
 
 #~ msgid " using certificate ID 0x%08lX\n"
 #~ msgstr " використовуємо ідентифікатор сертифіката 0x%08lX\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f3fcc6014..b12e7e4ba 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -398,14 +398,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
 #, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "注意：没有默认配置文件‘%s’\n"
-
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "选项文件‘%s’：%s\n"
-
-#, c-format
 msgid "reading options from '%s'\n"
 msgstr "从‘%s’读取选项\n"
 
@@ -1006,9 +998,27 @@ msgstr "无效的命令"
 msgid "invalid alias definition"
 msgstr "无效的别名定义"
 
+msgid "permission error"
+msgstr ""
+
 msgid "out of core"
 msgstr "out of core"
 
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "无效的命令"
+
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "未知命令‘%s’\n"
+
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "与预期不符的字符封装： "
+
 msgid "invalid option"
 msgstr "无效的选项"
 
@@ -1037,14 +1047,22 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr "命令 “%.50s” 含义模糊\n"
 
 #, c-format
-msgid "out of core\n"
-msgstr "out of core\n"
-
-#, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "无效的选项 “%.50s”\n"
 
 #, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "注意：没有默认配置文件‘%s’\n"
+
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "选项文件‘%s’：%s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "不能从 ‘%s’ 转换到 ‘%s’\n"
 
@@ -6549,6 +6567,10 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "一个 %u 位的散列对于一个 %u 位的 %s 密钥是无效的\n"
 
 #, c-format
+msgid "out of core\n"
+msgstr "out of core\n"
+
+#, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "（这是 MD2 算法）\n"
 
@@ -8563,155 +8585,130 @@ msgstr "组件未找到"
 msgid "No argument allowed"
 msgstr "没有参数被允许"
 
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "用法：gpg-check-pattern [选项] patternfile （-h 获取帮助）\n"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"命令：\n"
-" "
+"语法：gpg-check-pattern [选项] patternfile\n"
+"按照 patternfile 检查一个由标准输入（stdin）给定的密码\n"
 
-msgid "decryption modus"
-msgstr "解密模式"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "命令：\n"
+#~ " "
 
-msgid "encryption modus"
-msgstr "加密模式"
+#~ msgid "decryption modus"
+#~ msgstr "解密模式"
 
-#, fuzzy
-msgid "tool class (confucius)"
-msgstr "工具类（confucius）"
+#~ msgid "encryption modus"
+#~ msgstr "加密模式"
 
-msgid "program filename"
-msgstr "程序文件名"
+#, fuzzy
+#~ msgid "tool class (confucius)"
+#~ msgstr "工具类（confucius）"
 
-msgid "secret key file (required)"
-msgstr "私钥文件（必须）"
+#~ msgid "program filename"
+#~ msgstr "程序文件名"
 
-msgid "input file name (default stdin)"
-msgstr "输入文件名（默认为标准输入 stdin）"
+#~ msgid "secret key file (required)"
+#~ msgstr "私钥文件（必须）"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "用法：symcryptrun [选项] (-h 获取帮助)"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "输入文件名（默认为标准输入 stdin）"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"语法：symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"调用一个简单的对称加密工具\n"
-
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s 在 %s 上被取消，返回状态 %i\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "用法：symcryptrun [选项] (-h 获取帮助)"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s 在 %s 上失败，返回状态 %i\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "语法：symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "调用一个简单的对称加密工具\n"
 
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "无法创建临时目录‘%s’：%s\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s 在 %s 上被取消，返回状态 %i\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "不能为写入打开 %s ：%s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s 在 %s 上失败，返回状态 %i\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "写入 %s 时出现错误：%s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "无法创建临时目录‘%s’：%s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "读取 %s 时出现错误：%s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "不能为写入打开 %s ：%s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "关闭 %s 时出现错误：%s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "写入 %s 时出现错误：%s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "未提供 --program 选项\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "读取 %s 时出现错误：%s\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "只要 --decrypt 和 --encrypt 被支持\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "关闭 %s 时出现错误：%s\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "没有提供 --keyfile 选项\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "未提供 --program 选项\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "无法分配 args 向量\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "只要 --decrypt 和 --encrypt 被支持\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "无法创建管道：%s\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "没有提供 --keyfile 选项\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "无法创建 pty：%s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "无法分配 args 向量\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "无法执行 fork 方法：%s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "无法创建管道：%s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv 方法失败：%s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "无法创建 pty：%s\n"
 
-#, c-format
-msgid "select failed: %s\n"
-msgstr "select 失败：%s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "无法执行 fork 方法：%s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "read 失败：%s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv 方法失败：%s\n"
 
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "pty 读取失败：%s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "select 失败：%s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid 方法失败：%s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "read 失败：%s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "子进程被终止，返回状态为 %i\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "pty 读取失败：%s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "无法分配 infile 字符串：%s\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid 方法失败：%s\n"
 
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "无法分配 outfile 字符串：%s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "子进程被终止，返回状态为 %i\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "必须给定 %s 或 %s 中的任意一个\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "无法分配 infile 字符串：%s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr "没有给定类\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "无法分配 outfile 字符串：%s\n"
 
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "类 %s 不被支持\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "必须给定 %s 或 %s 中的任意一个\n"
 
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "用法：gpg-check-pattern [选项] patternfile （-h 获取帮助）\n"
+#~ msgid "no class provided\n"
+#~ msgstr "没有给定类\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"语法：gpg-check-pattern [选项] patternfile\n"
-"按照 patternfile 检查一个由标准输入（stdin）给定的密码\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "类 %s 不被支持\n"
 
 #~ msgid " using certificate ID 0x%08lX\n"
 #~ msgstr " 正在使用的证书标识 0x%08lX\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8d8cf1a3d..c4c029f0b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -417,14 +417,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
 #, c-format
-msgid "Note: no default option file '%s'\n"
-msgstr "請注意: 沒有預設選項檔 '%s'\n"
-
-#, c-format
-msgid "option file '%s': %s\n"
-msgstr "選項檔 '%s': %s\n"
-
-#, c-format
 msgid "reading options from '%s'\n"
 msgstr "從 '%s' 讀取選項中\n"
 
@@ -1027,9 +1019,27 @@ msgstr "無效的指令"
 msgid "invalid alias definition"
 msgstr "無效的別名定義"
 
+msgid "permission error"
+msgstr ""
+
 msgid "out of core"
 msgstr "超出核心"
 
+#, fuzzy
+#| msgid "invalid command"
+msgid "invalid meta command"
+msgstr "無效的指令"
+
+#, fuzzy
+#| msgid "unknown command '%s'\n"
+msgid "unknown meta command"
+msgstr "未知的指令 '%s'\n"
+
+#, fuzzy
+#| msgid "unexpected armor: "
+msgid "unexpected meta command"
+msgstr "未預期的封裝: "
+
 msgid "invalid option"
 msgstr "無效的選項"
 
@@ -1058,14 +1068,22 @@ msgid "command \"%.50s\" is ambiguous\n"
 msgstr "\"%.50s\" 指令不明確\n"
 
 #, c-format
-msgid "out of core\n"
-msgstr "超出核心\n"
-
-#, c-format
 msgid "invalid option \"%.50s\"\n"
 msgstr "無效的選項 \"%.50s\"\n"
 
 #, c-format
+msgid "Note: no default option file '%s'\n"
+msgstr "請注意: 沒有預設選項檔 '%s'\n"
+
+#, c-format
+msgid "option file '%s': %s\n"
+msgstr "選項檔 '%s': %s\n"
+
+#, c-format
+msgid "Note: ignoring option \"--%s\" due to global config\n"
+msgstr ""
+
+#, c-format
 msgid "conversion from '%s' to '%s' not available\n"
 msgstr "沒有從 '%s' 到 '%s' 之間的轉換可用\n"
 
@@ -6750,6 +6768,10 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u 位元的雜湊對 %u 位元的 %s 金鑰來說是無效的\n"
 
 #, c-format
+msgid "out of core\n"
+msgstr "超出核心\n"
+
+#, c-format
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(這是 MD2 演算法)\n"
 
@@ -8776,154 +8798,129 @@ msgstr "找不到元件"
 msgid "No argument allowed"
 msgstr "未允許使用引數"
 
+msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
+msgstr "用法: gpg-check-pattern [選項] 樣式檔案 (或用 -h 求助)\n"
+
 msgid ""
-"@\n"
-"Commands:\n"
-" "
+"Syntax: gpg-check-pattern [options] patternfile\n"
+"Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
-"@\n"
-"指令:\n"
-" "
+"語法: gpg-check-pattern [選項] 樣式檔案\n"
+"用樣式檔案來檢查由標準輸入給定的密語\n"
 
-msgid "decryption modus"
-msgstr "解密方式"
+#~ msgid ""
+#~ "@\n"
+#~ "Commands:\n"
+#~ " "
+#~ msgstr ""
+#~ "@\n"
+#~ "指令:\n"
+#~ " "
 
-msgid "encryption modus"
-msgstr "加密方式"
+#~ msgid "decryption modus"
+#~ msgstr "解密方式"
 
-msgid "tool class (confucius)"
-msgstr "工具類別 (confucius)"
+#~ msgid "encryption modus"
+#~ msgstr "加密方式"
 
-msgid "program filename"
-msgstr "程式檔名"
+#~ msgid "tool class (confucius)"
+#~ msgstr "工具類別 (confucius)"
 
-msgid "secret key file (required)"
-msgstr "私鑰檔案 (必要)"
+#~ msgid "program filename"
+#~ msgstr "程式檔名"
 
-msgid "input file name (default stdin)"
-msgstr "輸入檔名 (預設是標準輸入)"
+#~ msgid "secret key file (required)"
+#~ msgstr "私鑰檔案 (必要)"
 
-msgid "Usage: symcryptrun [options] (-h for help)"
-msgstr "用法: symcryptrun [選項] (或用 -h 求助)"
+#~ msgid "input file name (default stdin)"
+#~ msgstr "輸入檔名 (預設是標準輸入)"
 
-msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
-"[options...] COMMAND [inputfile]\n"
-"Call a simple symmetric encryption tool\n"
-msgstr ""
-"語法: symcryptrun --class 型別 --program 程式 --keyfile 金鑰檔案 [選項...] 指"
-"令 [輸入檔案]\n"
-"叫用單純對稱式加密工具\n"
+#~ msgid "Usage: symcryptrun [options] (-h for help)"
+#~ msgstr "用法: symcryptrun [選項] (或用 -h 求助)"
 
-#, c-format
-msgid "%s on %s aborted with status %i\n"
-msgstr "%s 於 %s 以 %i 狀態中止了\n"
+#~ msgid ""
+#~ "Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+#~ "[options...] COMMAND [inputfile]\n"
+#~ "Call a simple symmetric encryption tool\n"
+#~ msgstr ""
+#~ "語法: symcryptrun --class 型別 --program 程式 --keyfile 金鑰檔案 [選"
+#~ "項...] 指令 [輸入檔案]\n"
+#~ "叫用單純對稱式加密工具\n"
 
-#, c-format
-msgid "%s on %s failed with status %i\n"
-msgstr "%s 於 %s 以 %i 狀態失敗了\n"
+#~ msgid "%s on %s aborted with status %i\n"
+#~ msgstr "%s 於 %s 以 %i 狀態中止了\n"
 
-#, c-format
-msgid "can't create temporary directory '%s': %s\n"
-msgstr "無法建立暫存目錄 '%s': %s\n"
+#~ msgid "%s on %s failed with status %i\n"
+#~ msgstr "%s 於 %s 以 %i 狀態失敗了\n"
 
-#, c-format
-msgid "could not open %s for writing: %s\n"
-msgstr "無法開啟 %s 來寫入: %s\n"
+#~ msgid "can't create temporary directory '%s': %s\n"
+#~ msgstr "無法建立暫存目錄 '%s': %s\n"
 
-#, c-format
-msgid "error writing to %s: %s\n"
-msgstr "寫入 %s 時出錯: %s\n"
+#~ msgid "could not open %s for writing: %s\n"
+#~ msgstr "無法開啟 %s 來寫入: %s\n"
 
-#, c-format
-msgid "error reading from %s: %s\n"
-msgstr "讀取 %s 時出錯: %s\n"
+#~ msgid "error writing to %s: %s\n"
+#~ msgstr "寫入 %s 時出錯: %s\n"
 
-#, c-format
-msgid "error closing %s: %s\n"
-msgstr "關閉 %s 時出錯: %s\n"
+#~ msgid "error reading from %s: %s\n"
+#~ msgstr "讀取 %s 時出錯: %s\n"
 
-#, c-format
-msgid "no --program option provided\n"
-msgstr "沒有提供 --program 選項\n"
+#~ msgid "error closing %s: %s\n"
+#~ msgstr "關閉 %s 時出錯: %s\n"
 
-#, c-format
-msgid "only --decrypt and --encrypt are supported\n"
-msgstr "祇支援 --decrypt 和 --encrypt\n"
+#~ msgid "no --program option provided\n"
+#~ msgstr "沒有提供 --program 選項\n"
 
-#, c-format
-msgid "no --keyfile option provided\n"
-msgstr "沒有提供 --keyfile 選項\n"
+#~ msgid "only --decrypt and --encrypt are supported\n"
+#~ msgstr "祇支援 --decrypt 和 --encrypt\n"
 
-#, c-format
-msgid "cannot allocate args vector\n"
-msgstr "無法配置引數向量\n"
+#~ msgid "no --keyfile option provided\n"
+#~ msgstr "沒有提供 --keyfile 選項\n"
 
-#, c-format
-msgid "could not create pipe: %s\n"
-msgstr "無法建立管道: %s\n"
+#~ msgid "cannot allocate args vector\n"
+#~ msgstr "無法配置引數向量\n"
 
-#, c-format
-msgid "could not create pty: %s\n"
-msgstr "無法建立 pty: %s\n"
+#~ msgid "could not create pipe: %s\n"
+#~ msgstr "無法建立管道: %s\n"
 
-#, c-format
-msgid "could not fork: %s\n"
-msgstr "無法衍生: %s\n"
+#~ msgid "could not create pty: %s\n"
+#~ msgstr "無法建立 pty: %s\n"
 
-#, c-format
-msgid "execv failed: %s\n"
-msgstr "execv 失敗: %s\n"
+#~ msgid "could not fork: %s\n"
+#~ msgstr "無法衍生: %s\n"
 
-#, c-format
-msgid "select failed: %s\n"
-msgstr "挑選失敗: %s\n"
+#~ msgid "execv failed: %s\n"
+#~ msgstr "execv 失敗: %s\n"
 
-#, c-format
-msgid "read failed: %s\n"
-msgstr "讀取失敗: %s\n"
+#~ msgid "select failed: %s\n"
+#~ msgstr "挑選失敗: %s\n"
 
-#, c-format
-msgid "pty read failed: %s\n"
-msgstr "pty 讀取失敗: %s\n"
+#~ msgid "read failed: %s\n"
+#~ msgstr "讀取失敗: %s\n"
 
-#, c-format
-msgid "waitpid failed: %s\n"
-msgstr "waitpid 失敗: %s\n"
+#~ msgid "pty read failed: %s\n"
+#~ msgstr "pty 讀取失敗: %s\n"
 
-#, c-format
-msgid "child aborted with status %i\n"
-msgstr "子代以 %i 狀態中止了\n"
+#~ msgid "waitpid failed: %s\n"
+#~ msgstr "waitpid 失敗: %s\n"
 
-#, c-format
-msgid "cannot allocate infile string: %s\n"
-msgstr "無法配置檔內字串: %s\n"
-
-#, c-format
-msgid "cannot allocate outfile string: %s\n"
-msgstr "無法配置檔外字串: %s\n"
+#~ msgid "child aborted with status %i\n"
+#~ msgstr "子代以 %i 狀態中止了\n"
 
-#, c-format
-msgid "either %s or %s must be given\n"
-msgstr "一定要給定 %s 或 %s 其中之一\n"
+#~ msgid "cannot allocate infile string: %s\n"
+#~ msgstr "無法配置檔內字串: %s\n"
 
-#, c-format
-msgid "no class provided\n"
-msgstr "沒有提供類別\n"
+#~ msgid "cannot allocate outfile string: %s\n"
+#~ msgstr "無法配置檔外字串: %s\n"
 
-#, c-format
-msgid "class %s is not supported\n"
-msgstr "未支援 %s 類別\n"
+#~ msgid "either %s or %s must be given\n"
+#~ msgstr "一定要給定 %s 或 %s 其中之一\n"
 
-msgid "Usage: gpg-check-pattern [options] patternfile (-h for help)\n"
-msgstr "用法: gpg-check-pattern [選項] 樣式檔案 (或用 -h 求助)\n"
+#~ msgid "no class provided\n"
+#~ msgstr "沒有提供類別\n"
 
-msgid ""
-"Syntax: gpg-check-pattern [options] patternfile\n"
-"Check a passphrase given on stdin against the patternfile\n"
-msgstr ""
-"語法: gpg-check-pattern [選項] 樣式檔案\n"
-"用樣式檔案來檢查由標準輸入給定的密語\n"
+#~ msgid "class %s is not supported\n"
+#~ msgstr "未支援 %s 類別\n"
 
 #~ msgid " using certificate ID 0x%08lX\n"
 #~ msgstr " 以憑證 ID 0x%08lX\n"