From 569a9a1adeb0d9f8a1493f916a1e0c34e149974c Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sun, 10 Mar 2013 17:57:11 -0400 Subject: [PATCH] Version 3.0.0. --- configure.ac | 2 +- po/pwmd.pot | 256 +++++++++++++++++++++++++++++++---------------------------- 2 files changed, 135 insertions(+), 123 deletions(-) diff --git a/configure.ac b/configure.ac index df065994..c505656f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.60) -AC_INIT(pwmd, 3.0.0-dev, [Ben Kibbey bjk@luxsci.net]) +AC_INIT(pwmd, 3.0.0, [Ben Kibbey bjk@luxsci.net]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR(build) AC_CANONICAL_TARGET diff --git a/po/pwmd.pot b/po/pwmd.pot index c7c9dc40..af03fc7e 100644 --- a/po/pwmd.pot +++ b/po/pwmd.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bjk@luxsci.net\n" -"POT-Creation-Date: 2013-02-23 10:06-0500\n" +"POT-Creation-Date: 2013-03-10 17:57-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,194 +22,199 @@ msgstr "" msgid "%s: %p not found" msgstr "" -#: src/agent.c:313 +#: src/agent.c:239 +#, c-format +msgid "gpg-agent connection died (rc=%i), reconnecting" +msgstr "" + +#: src/agent.c:314 #, c-format msgid "Inquired data too large: have=%u, max=%u" msgstr "" -#: src/agent.c:388 +#: src/agent.c:392 #, c-format msgid "Keygrip is %s, bits=%i" msgstr "" -#: src/agent.c:398 +#: src/agent.c:402 #, c-format msgid "" "A %s is required to unlock the secret key for the encrypted data file \"%s" "\". Please enter the %s below." msgstr "" -#: src/agent.c:400 src/agent.c:401 +#: src/agent.c:404 src/agent.c:405 msgid "passphrase" msgstr "" -#: src/agent.c:551 +#: src/agent.c:652 #, c-format msgid "Signed with keygrip %s" msgstr "" -#: src/agent.c:632 +#: src/agent.c:750 #, c-format msgid "Encrypted with keygrip %s" msgstr "" -#: src/agent.c:748 +#: src/agent.c:866 #, c-format msgid "Keygrip is %s" msgstr "" -#: src/agent.c:784 +#: src/agent.c:902 #, c-format msgid "WARNING: keylen=%i, truncated to %i." msgstr "" -#: src/agent.c:899 +#: src/agent.c:1017 #, c-format msgid "The passphrase is too large: have=%u, max=%u." msgstr "" -#: src/agent.c:968 +#: src/agent.c:1086 msgid "Generating a new keypair ..." msgstr "" -#: src/agent.c:971 +#: src/agent.c:1089 #, c-format msgid "Using passphrase obtained from file '%s'" msgstr "" -#: src/agent.c:1005 +#: src/agent.c:1124 #, c-format msgid "Success! Keygrip is %s." msgstr "" -#: src/agent.c:1013 +#: src/agent.c:1132 #, c-format msgid "Signed with keygrip %s." msgstr "" -#: src/pwmd.c:256 +#: src/pwmd.c:260 #, c-format msgid "reloading configuration file '%s'" msgstr "" -#: src/pwmd.c:471 +#: src/pwmd.c:477 msgid "unknown" msgstr "" -#: src/pwmd.c:529 +#: src/pwmd.c:535 #, c-format msgid "gcry_check_version(): Incompatible libgcrypt. Wanted %s, got %s.\n" msgstr "" -#: src/pwmd.c:715 +#: src/pwmd.c:721 msgid "accepted" msgstr "" -#: src/pwmd.c:715 +#: src/pwmd.c:721 msgid "rejected" msgstr "" -#: src/pwmd.c:920 +#: src/pwmd.c:926 #, c-format msgid "exiting, fd=%i" msgstr "" -#: src/pwmd.c:1130 +#: src/pwmd.c:1136 #, c-format msgid "Importing XML from '%s'. Output will be written to '%s' ..." msgstr "" -#: src/pwmd.c:1172 +#: src/pwmd.c:1178 msgid "Could not find root \"pwmd\" element." msgstr "" -#: src/pwmd.c:1195 +#: src/pwmd.c:1201 msgid "Success!" msgstr "" -#: src/pwmd.c:1235 +#: src/pwmd.c:1241 #, c-format msgid "Trying to add datafile '%s' to the file cache ..." msgstr "" -#: src/pwmd.c:1240 +#: src/pwmd.c:1246 #, c-format msgid "%s: Invalid characters in filename" msgstr "" -#: src/pwmd.c:1308 +#: src/pwmd.c:1314 #, c-format msgid "Successfully added '%s' to the cache." msgstr "" -#: src/pwmd.c:1360 +#: src/pwmd.c:1366 #, c-format msgid "new connection: tid=%p, fd=%i, addr=%s" msgstr "" -#: src/pwmd.c:1363 +#: src/pwmd.c:1369 #, c-format msgid "new connection: tid=%p, fd=%i" msgstr "" -#: src/pwmd.c:1811 +#: src/pwmd.c:1817 #, c-format msgid "caught signal %i (%s)" msgstr "" -#: src/pwmd.c:1823 +#: src/pwmd.c:1829 msgid "clearing file cache" msgstr "" -#: src/pwmd.c:1867 +#: src/pwmd.c:1873 msgid "waiting for all clients to disconnect" msgstr "" -#: src/pwmd.c:1890 +#: src/pwmd.c:1896 #, c-format msgid "%i clients remain" msgstr "" -#: src/pwmd.c:1969 +#: src/pwmd.c:1975 #, c-format msgid "%s started for user %s" msgstr "" -#: src/pwmd.c:1973 +#: src/pwmd.c:1979 #, c-format msgid "Listening on %s and TCP port %i" msgstr "" -#: src/pwmd.c:1976 src/pwmd.c:1978 +#: src/pwmd.c:1982 src/pwmd.c:1984 #, c-format msgid "Listening on %s" msgstr "" -#: src/pwmd.c:2060 +#: src/pwmd.c:2066 msgid "Received second termination request. Exiting." msgstr "" -#: src/pwmd.c:2108 +#: src/pwmd.c:2114 msgid "" "Failed to add a file to the cache. Use --ignore to force startup. Exiting." msgstr "" -#: src/pwmd.c:2203 +#: src/pwmd.c:2209 #, c-format msgid "Converting version 2 data file \"%s\" ..." msgstr "" -#: src/pwmd.c:2213 +#: src/pwmd.c:2219 #, c-format msgid "Using passphrase file \"%s\" for decryption ..." msgstr "" -#: src/pwmd.c:2290 +#: src/pwmd.c:2296 #, c-format msgid "Output written to \"%s\"." msgstr "" -#: src/pwmd.c:2312 +#: src/pwmd.c:2318 #, c-format msgid "" "Usage: %s [OPTIONS] [file1] [...]\n" @@ -239,7 +244,7 @@ msgid "" " --version show version and compile time features\n" msgstr "" -#: src/pwmd.c:2554 +#: src/pwmd.c:2566 #, c-format msgid "" "%s\n" @@ -252,49 +257,49 @@ msgid "" "%s" msgstr "" -#: src/pwmd.c:2669 -msgid "incompatible version: 2.1.0 or later required" +#: src/pwmd.c:2683 +msgid "incompatible gpg-agent version: 2.1.0 or later required" msgstr "" -#: src/pwmd.c:2797 +#: src/pwmd.c:2811 msgid "Done. Daemonizing..." msgstr "" -#: src/pwmd.c:2798 +#: src/pwmd.c:2812 msgid "Done. Waiting for connections..." msgstr "" -#: src/pwmd.c:2834 +#: src/pwmd.c:2848 #, c-format msgid "" "Either there is another pwmd running or '%s' is a \n" "stale socket. Please remove it manually." msgstr "" -#: src/pwmd.c:2947 +#: src/pwmd.c:2961 msgid "pwmd exiting normally" msgstr "" -#: src/status.c:87 +#: src/status.c:90 msgid "Waiting for lock" msgstr "" -#: src/commands.c:326 +#: src/commands.c:331 #, c-format msgid "Bad passphrase (try %i of %i)" msgstr "" -#: src/commands.c:624 +#: src/commands.c:631 #, c-format msgid "client validation failed for file '%s'" msgstr "" -#: src/commands.c:3837 +#: src/commands.c:3914 #, c-format msgid "command completed: rc=%u" msgstr "" -#: src/commands.c:3853 +#: src/commands.c:3930 msgid "" "Usage: HELP []\n" "For commands that take an element path as an argument, each element is " @@ -302,25 +307,25 @@ msgid "" "COMMANDS:" msgstr "" -#: src/commands.c:3885 +#: src/commands.c:3962 #, c-format msgid "Usage: %s" msgstr "" -#: src/commands.c:4240 +#: src/commands.c:4317 msgid "" "HELP []\n" "Show available commands or command specific help text." msgstr "" -#: src/commands.c:4245 +#: src/commands.c:4322 msgid "" "AGENT \n" "Send a @command{gpg-agent} protocol @var{command} directly to the @command" "{gpg-agent}." msgstr "" -#: src/commands.c:4251 +#: src/commands.c:4328 msgid "" "GETINFO [--data] CACHE | CLIENTS | PID | LAST_ERROR | VERSION\n" "Get server and other information: @var{cache} returns the number of cached " @@ -334,7 +339,7 @@ msgid "" "via a data response rather than a status message." msgstr "" -#: src/commands.c:4265 +#: src/commands.c:4342 msgid "" "PASSWD [--reset] [--s2k-count=N]\n" "Changes the passphrase of the secret key required to open the current file " @@ -349,7 +354,7 @@ msgid "" "files." msgstr "" -#: src/commands.c:4280 +#: src/commands.c:4357 msgid "" "KEYGRIP [--sign] \n" "Returns the hex encoded keygrip of the specified @var{filename} with a data " @@ -360,7 +365,7 @@ msgid "" "GPG_ERR_NOT_SUPPORTED." msgstr "" -#: src/commands.c:4292 +#: src/commands.c:4369 msgid "" "OPEN [--lock] []\n" "Opens @var{filename} using @var{passphrase}. When the filename is not found " @@ -374,17 +379,17 @@ msgid "" "has been opened." msgstr "" -#: src/commands.c:4307 +#: src/commands.c:4384 msgid "" "SAVE [--no-passphrase] [--reset] [--no-agent] [--s2k-count=N] [--" "cipher=] [--cipher-iterations=N] [--inquire-keyparam] [--" -"keygrip=hexstring [--sign-keygrip=hexstring]]\n" +"keygrip=hexstring] [--sign-keygrip=hexstring]\n" "Writes the @abbr{XML} document to disk. The file written to is the file that " "was opened using the @code{OPEN} command (@pxref{OPEN}). If the file is a " "new one or the option @option{--inquire-keyparam} was passed, then a new " "keypair will be generated and a pinentry will be used to prompt for the " "passphrase to encrypt with unless the @option{--no-passphrase} option was " -"passed, in which case the data file will not be passphrase protected.\n" +"passed in which case the data file will not be passphrase protected. \n" "The @option{--no-agent} option disables use of @command{gpg-agent} for " "passphrase retrieval and caching of new files when @command{gpg-agent} use " "is enabled. The datafile will be symmetrically encrypted and will not use or " @@ -402,7 +407,9 @@ msgid "" "specified then an @samp{RSA} key of @samp{2048} bits will be generated " "unless otherwise set in the configuration file (@pxref{Configuration}). Note " "that when this option is specified a new keypair will be generated " -"reguardless if the file is a new one or not.\n" +"reguardless if the file is a new one and that if the data file is protected " +"the passphrase to open it will be required before generating the new " +"keypair.\n" "You can encrypt the data file to a public key other than the one that it was " "originally encrypted with by passing the @option{--keygrip} option with the " "hex encoded keygrip of the public key as its argument. The keygrip may be of " @@ -412,12 +419,12 @@ msgid "" "symmetrically encrypted data files.\n" "The @option{--s2k-count} option sets number of hash iterations for a " "passphrase. A value less-than @code{65536} will use the machine calibrated " -"value which is the default. This setting only affects new files. To change " -"the setting, use the @code{PASSWD} command (@pxref{PASSWD}). This option has " -"no effect with symmetrically encrypted data files." +"value and is the default. This setting only affects new files. To change the " +"setting use the @code{PASSWD} command (@pxref{PASSWD}). This option has no " +"effect with symmetrically encrypted data files." msgstr "" -#: src/commands.c:4354 +#: src/commands.c:4432 msgid "" "ISCACHED [--lock] \n" "An @emph{OK} response is returned if the specified @var{filename} is found " @@ -428,13 +435,13 @@ msgid "" "file exists; it does not need to be opened nor cached." msgstr "" -#: src/commands.c:4365 +#: src/commands.c:4443 msgid "" "CLEARCACHE []\n" "Clears a file cache entry for all or the specified @var{filename}." msgstr "" -#: src/commands.c:4370 +#: src/commands.c:4448 msgid "" "CACHETIMEOUT \n" "The time in @var{seconds} until @var{filename} will be removed from the " @@ -443,7 +450,7 @@ msgid "" "@pxref{SAVE}). @xref{Configuration}, and the @code{cache_timeout} parameter." msgstr "" -#: src/commands.c:4379 +#: src/commands.c:4457 msgid "" "LIST [--inquire] [--no-recurse] [--verbose] [--with-target] [--all] [[!]" "element[[!]child[..]]]\n" @@ -477,7 +484,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4416 +#: src/commands.c:4494 msgid "" "REALPATH [--inquire] [!]element[[!]child[..]]\n" "Resolves all @code{target} attributes of the specified element path and " @@ -487,7 +494,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4425 +#: src/commands.c:4503 msgid "" "STORE [!]element[[!]child[..]][content]\n" "This command uses a server @emph{INQUIRE} to retrieve data from the client.\n" @@ -505,7 +512,7 @@ msgid "" "to prevent @abbr{XML} parsing and @command{pwmd} syntax errors." msgstr "" -#: src/commands.c:4444 +#: src/commands.c:4522 msgid "" "RENAME [--inquire] [!]element[[!]child[..]] \n" "Renames the specified @var{element} to the new @var{value}. If an element of " @@ -514,7 +521,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4453 +#: src/commands.c:4531 msgid "" "COPY [--inquire] [!]source[[!]child[..]] [!]dest[[!]child[..]]\n" "Copies the entire element tree starting from the child node of the source " @@ -528,7 +535,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4469 +#: src/commands.c:4547 msgid "" "MOVE [--inquire] [!]source[[!]child[..]] [[!]dest[[!]child[..]]]\n" "Moves the source element path to the destination element path. If the " @@ -540,7 +547,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4481 +#: src/commands.c:4559 msgid "" "DELETE [--inquire] [!]element[[!]child[..]]\n" "Removes the specified element path and all of its children. This may break " @@ -550,7 +557,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4491 +#: src/commands.c:4569 msgid "" "GET [--inquire] [!]element[[!]child[..]]\n" "Retrieves the content of the specified element. The content is returned with " @@ -559,7 +566,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4500 +#: src/commands.c:4578 msgid "" "ATTR [--inquire] SET|GET|DELETE|LIST [] [!]element[[!]child" "[..]] ..\n" @@ -592,14 +599,14 @@ msgid "" "@xref{Target Attribute}, for details about this special attribute." msgstr "" -#: src/commands.c:4537 +#: src/commands.c:4615 msgid "" "XPATH [--inquire] [[value]]\n" -"Evaluates an XPath @var{expression}. If no @var{value} argument is " -"specified, it is assumed the expression is a request to return a result. " -"Otherwise, the result is set to the @var{value} argument and the document is " -"updated. If there is no @var{value} after the @key{TAB} character, the value " -"is assumed to be empty and the document is updated. For example:@sp 1\n" +"Evaluates an XPath @var{expression}. If no @var{value} argument is specified " +"it is assumed the expression is a request to return a result. Otherwise, the " +"result is set to the @var{value} argument and the document is updated. If " +"there is no @var{value} after the @key{TAB} character, the value is assumed " +"to be empty and the document is updated. For example:@sp 1\n" "@example\n" "XPATH //element[@@_name='password']@key{TAB}\n" "@end example\n" @@ -612,7 +619,7 @@ msgid "" "expression syntax." msgstr "" -#: src/commands.c:4560 +#: src/commands.c:4638 msgid "" "XPATHATTR [--inquire] SET|DELETE [[]]\n" "Like the @code{XPATH} command (@pxref{XPATH}) but operates on element " @@ -630,27 +637,27 @@ msgid "" "expression syntax." msgstr "" -#: src/commands.c:4581 +#: src/commands.c:4659 msgid "" -"IMPORT [[!]element[[!]child[..]]]\n" +"IMPORT [--root [!]element[[!]child[..]]] \n" "This command uses a server @emph{INQUIRE} to retrieve data from the client.\n" "Like the @code{STORE} command (@pxref{STORE}), but the @var{content} " "argument is raw @abbr{XML} data. The content is created as a child of the " -"specified element path and will overwrite an existing element of the same " -"name. If an element of the element path does not exist then it will be " -"created.\n" +"element path specified with the @option{--root} option or at the document " +"root when not specified. Existing elements of the same name will be " +"overwritten.\n" "The content must begin with an @abbr{XML} element node. @xref{Introduction}, " "for details." msgstr "" -#: src/commands.c:4595 +#: src/commands.c:4673 msgid "" "DUMP\n" "Shows the in memory @abbr{XML} document with indenting. @xref{XPATH}, for " "dumping a specific node." msgstr "" -#: src/commands.c:4601 +#: src/commands.c:4679 msgid "" "LOCK\n" "Locks the mutex associated with the opened file. This prevents other clients " @@ -659,7 +666,7 @@ msgid "" "{UNLOCK}." msgstr "" -#: src/commands.c:4609 +#: src/commands.c:4687 msgid "" "UNLOCK\n" "Unlocks the file mutex which was locked with the @code{LOCK} command or a " @@ -667,7 +674,7 @@ msgid "" "{ISCACHED})." msgstr "" -#: src/commands.c:4616 +#: src/commands.c:4694 msgid "" "GETCONFIG [filename] \n" "Returns the value of a @command{pwmd} configuration @var{parameter} with a " @@ -677,81 +684,86 @@ msgid "" "with the @code{OPTION} command (@pxref{OPTION}) will be returned." msgstr "" -#: src/commands.c:4625 +#: src/commands.c:4703 msgid "" "OPTION =\n" "Sets a client option @var{name} to @var{value}. The value for an option is " "kept for the duration of the connection.\n" "@table @asis\n" "@item DISABLE-PINENTRY\n" -" Disable use of @command{pinentry} for passphrase retrieval. When set, a " -"server inquire is sent to the client to obtain the passphrase. This option " -"may be set as needed before the @pxref{OPEN}, @pxref{PASSWD}, and @pxref" +"Disable use of @command{pinentry} for passphrase retrieval. When set, a " +"server inquire is sent to the client to obtain the passphrase. This option " +"may be set as needed before the @pxref{OPEN}, @pxref{PASSWD}, and @pxref" "{SAVE} commands.\n" +"@item PINENTRY-TIMEOUT\n" +"Sets the number of seconds before a pinentry prompt will return an error " +"while waiting for user input.\n" "@item TTYNAME\n" -" Passed to the @command{gpg-agent} and used for the @command{pinentry} " +"Passed to the @command{gpg-agent} and used for the @command{pinentry} " "dialog.\n" "@item TTYTYPE\n" -" Passed to the @command{gpg-agent} and used for the @command{pinentry} " +"Passed to the @command{gpg-agent} and used for the @command{pinentry} " "dialog.\n" "@item DISPLAY\n" -" Passed to the @command{gpg-agent} and used for the @command{pinentry} " +"Passed to the @command{gpg-agent} and used for the @command{pinentry} " "dialog.\n" "@item PINENTRY-DESC\n" -" Sets the description string of the @command{gpg-agent} and @command" +"Sets the description string of the @command{gpg-agent} and @command" "{pinentry} dialog.\n" "@item PINENTRY-TITLE\n" -" Sets the title string of the @command{gpg-agent} and @command{pinentry} " +"Sets the title string of the @command{gpg-agent} and @command{pinentry} " "dialog.\n" "@item PINENTRY-PROMPT\n" -" Sets the prompt string of the @command{gpg-agent} and @command{pinentry} " +"Sets the prompt string of the @command{gpg-agent} and @command{pinentry} " "dialog.\n" "@item LC-CTYPE\n" -" Passed to the @command{gpg-agent} and used for the @command{pinentry} " +"Passed to the @command{gpg-agent} and used for the @command{pinentry} " "dialog.\n" "@item LC-MESSAGES\n" -" Passed to the @command{gpg-agent} and used for the @command{pinentry} " +"Passed to the @command{gpg-agent} and used for the @command{pinentry} " "dialog.\n" "@item NAME\n" -" Associates the thread ID of the connection with the specified textual " +"Associates the thread ID of the connection with the specified textual " "representation. Useful for debugging log messages.\n" "@item LOCK-TIMEOUT\n" -" When not @code{0}, the duration in tenths of a second to wait for the file " +"When not @code{0}, the duration in tenths of a second to wait for the file " "mutex which has been locked by another thread to be released before " "returning an error. When @code{-1}, then an error will be returned " -"immediately.@end table\n" +"immediately.\n" +"@item LOG-LEVEL\n" +"An integer specifiying the logging level.@end table\n" msgstr "" -#: src/commands.c:4672 +#: src/commands.c:4757 msgid "" "LS\n" "Lists the available data files stored in the data directory (@file{~/.pwmd/" "data}). The result is a newline separated list of filenames." msgstr "" -#: src/commands.c:4678 +#: src/commands.c:4763 msgid "" "RESET\n" "Closes the currently opened file but keeps any previously set client options." msgstr "" -#: src/commands.c:4683 +#: src/commands.c:4768 msgid "" "NOP\n" "Does nothing. Always returns successfully." msgstr "" -#: src/convert.c:356 +#: src/convert.c:357 msgid "" "A passphrase is required to decrypt the file for converting. Please enter " "the passphrase below." msgstr "" -#: src/convert.c:365 +#: src/convert.c:366 msgid "Passphrase:" msgstr "" -#: src/convert.c:455 +#: src/convert.c:456 #, c-format msgid "Decrypting ...\n" msgstr "" @@ -789,26 +801,26 @@ msgstr "" msgid "Warning: unknown element '%s' at %s. Ignoring." msgstr "" -#: src/tls.c:88 +#: src/tls.c:90 msgid "client certificate is invalid" msgstr "" -#: src/tls.c:91 +#: src/tls.c:93 msgid "client certificate is revoked" msgstr "" -#: src/tls.c:94 +#: src/tls.c:96 msgid "client certificate has no signer" msgstr "" -#: src/tls.c:97 +#: src/tls.c:99 msgid "client certificate signer is not from CA" msgstr "" -#: src/tls.c:100 +#: src/tls.c:102 msgid "client certificate has insecure algorithm" msgstr "" -#: src/tls.c:351 +#: src/tls.c:353 msgid "Generating key exchange parameters..." msgstr "" -- 2.11.4.GIT