From 17392f981dd3654af58bab0d01a36863b1ca0470 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Sat, 17 Jan 2015 16:49:36 -0500 Subject: [PATCH] Version 3.0.13. --- configure.ac | 2 +- po/pwmd.pot | 228 +++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 129 insertions(+), 101 deletions(-) diff --git a/configure.ac b/configure.ac index 94fc7362..25905ead 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.13-dev, [Ben Kibbey bjk@luxsci.net]) +AC_INIT(pwmd, 3.0.13, [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 9dd42bca..5d5f0a8b 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: 2014-10-05 08:37-0400\n" +"POT-Creation-Date: 2015-01-17 16:31-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -73,160 +73,161 @@ msgstr "" msgid "The passphrase is too large: have=%u, max=%u." msgstr "" -#: src/agent.c:1058 +#: src/agent.c:1060 msgid "Generating a new keypair ..." msgstr "" -#: src/agent.c:1061 +#: src/agent.c:1063 #, c-format msgid "Using passphrase obtained from file '%s'" msgstr "" -#: src/agent.c:1096 +#: src/agent.c:1098 #, c-format msgid "Success! Keygrip is %s." msgstr "" -#: src/agent.c:1104 +#: src/agent.c:1106 #, c-format msgid "Signed with keygrip %s." msgstr "" -#: src/pwmd.c:305 +#: src/pwmd.c:307 #, c-format msgid "reloading configuration file '%s'" msgstr "" -#: src/pwmd.c:534 +#: src/pwmd.c:536 msgid "unknown" msgstr "" -#: src/pwmd.c:600 +#: src/pwmd.c:602 #, c-format msgid "gcry_check_version(): Incompatible libgcrypt. Wanted %s, got %s.\n" msgstr "" -#: src/pwmd.c:864 +#: src/pwmd.c:874 msgid "accepted" msgstr "" -#: src/pwmd.c:864 +#: src/pwmd.c:874 msgid "rejected" msgstr "" -#: src/pwmd.c:1068 +#: src/pwmd.c:1084 #, c-format msgid "exiting, fd=%i" msgstr "" -#: src/pwmd.c:1278 +#: src/pwmd.c:1302 #, c-format msgid "Importing XML from '%s'. Output will be written to '%s' ..." msgstr "" -#: src/pwmd.c:1320 +#: src/pwmd.c:1344 msgid "Could not find root \"pwmd\" element." msgstr "" -#: src/pwmd.c:1343 +#: src/pwmd.c:1367 msgid "Success!" msgstr "" -#: src/pwmd.c:1383 +#: src/pwmd.c:1407 #, c-format msgid "Trying to add datafile '%s' to the file cache ..." msgstr "" -#: src/pwmd.c:1388 +#: src/pwmd.c:1412 #, c-format msgid "%s: Invalid characters in filename" msgstr "" -#: src/pwmd.c:1456 +#: src/pwmd.c:1480 #, c-format msgid "Successfully added '%s' to the cache." msgstr "" -#: src/pwmd.c:1508 +#: src/pwmd.c:1538 #, c-format msgid "new connection: tid=%p, fd=%i, addr=%s" msgstr "" -#: src/pwmd.c:1511 +#: src/pwmd.c:1545 #, c-format msgid "new connection: tid=%p, fd=%i" msgstr "" -#: src/pwmd.c:1950 +#: src/pwmd.c:1990 #, c-format msgid "caught signal %i (%s)" msgstr "" -#: src/pwmd.c:1958 +#: src/pwmd.c:1998 msgid "clearing file cache" msgstr "" -#: src/pwmd.c:1979 +#: src/pwmd.c:2019 #, c-format msgid "Caught signal %i (%s). Exiting." msgstr "" -#: src/pwmd.c:2002 +#: src/pwmd.c:2042 msgid "waiting for all clients to disconnect" msgstr "" -#: src/pwmd.c:2025 +#: src/pwmd.c:2065 #, c-format msgid "%i clients remain" msgstr "" -#: src/pwmd.c:2105 +#: src/pwmd.c:2145 #, c-format msgid "%s started for user %s" msgstr "" -#: src/pwmd.c:2110 +#: src/pwmd.c:2150 #, c-format msgid "Listening on %s and TCP port %i as user %i" msgstr "" -#: src/pwmd.c:2113 src/pwmd.c:2115 +#: src/pwmd.c:2153 src/pwmd.c:2155 #, c-format msgid "Listening on %s" msgstr "" -#: src/pwmd.c:2197 +#: src/pwmd.c:2237 msgid "Received second termination request. Exiting." msgstr "" -#: src/pwmd.c:2245 +#: src/pwmd.c:2285 msgid "" "Failed to add a file to the cache. Use --ignore to force startup. Exiting." msgstr "" -#: src/pwmd.c:2340 +#: src/pwmd.c:2380 #, c-format msgid "Converting version 2 data file \"%s\" ..." msgstr "" -#: src/pwmd.c:2350 +#: src/pwmd.c:2390 #, c-format msgid "Using passphrase file \"%s\" for decryption ..." msgstr "" -#: src/pwmd.c:2425 +#: src/pwmd.c:2465 #, c-format msgid "Output written to \"%s\"." msgstr "" -#: src/pwmd.c:2447 +#: src/pwmd.c:2488 #, c-format msgid "" "Usage: %s [OPTIONS] [file1] [...]\n" " -f, --rcfile=filename load the specfied configuration file\n" " (~/.pwmd/config)\n" " --homedir alternate pwmd home directory (~/.pwmd)\n" -" --use-agent enable use of gpg-agent\n" +" --kill terminate an existing instance of pwmd\n" +" --use-agent[=integer] enable/disable use of gpg-agent\n" " -n, --no-fork run as a foreground process\n" " -D, --disable-dump disable the LIST, XPATH and DUMP commands\n" " --ignore, --force ignore file errors during startup\n" @@ -249,22 +250,22 @@ msgid "" " --version show version and compile time features\n" msgstr "" -#: src/pwmd.c:2480 +#: src/pwmd.c:2522 #, c-format msgid "removing stale socket %s" msgstr "" -#: src/pwmd.c:2546 +#: src/pwmd.c:2597 #, c-format msgid "an instance for socket %s is already running" msgstr "" -#: src/pwmd.c:2782 +#: src/pwmd.c:2841 #, c-format msgid "" "%s\n" "\n" -"Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014\n" +"Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015\n" "%s\n" "Released under the terms of the GPL v2. Use at your own risk.\n" "\n" @@ -272,26 +273,26 @@ msgid "" "%s" msgstr "" -#: src/pwmd.c:2894 +#: src/pwmd.c:2953 msgid "incompatible gpg-agent version: 2.1.0 or later required" msgstr "" -#: src/pwmd.c:3010 +#: src/pwmd.c:3075 #, c-format msgid "" "Either there is another pwmd running or '%s' is a \n" "stale socket. Please remove it manually." msgstr "" -#: src/pwmd.c:3099 +#: src/pwmd.c:3164 msgid "Done. Daemonizing..." msgstr "" -#: src/pwmd.c:3100 +#: src/pwmd.c:3165 msgid "Done. Waiting for connections..." msgstr "" -#: src/pwmd.c:3181 +#: src/pwmd.c:3246 msgid "pwmd exiting normally" msgstr "" @@ -299,17 +300,17 @@ msgstr "" msgid "Waiting for lock" msgstr "" -#: src/commands.c:339 +#: src/commands.c:396 #, c-format msgid "Bad passphrase (try %i of %i)" msgstr "" -#: src/commands.c:4117 +#: src/commands.c:4197 #, c-format msgid "command completed: rc=%u" msgstr "" -#: src/commands.c:4133 +#: src/commands.c:4214 msgid "" "Usage: HELP []\n" "For commands that take an element path as an argument, each element is " @@ -317,40 +318,58 @@ msgid "" "COMMANDS:" msgstr "" -#: src/commands.c:4165 +#: src/commands.c:4247 #, c-format msgid "Usage: %s" msgstr "" -#: src/commands.c:4542 +#: src/commands.c:4736 msgid "" "HELP []\n" "Show available commands or command specific help text." msgstr "" -#: src/commands.c:4547 +#: src/commands.c:4741 msgid "" "AGENT \n" "Send a @command{gpg-agent} protocol @var{command} directly to the " "@command{gpg-agent}." msgstr "" -#: src/commands.c:4553 -msgid "" -"GETINFO [--data] CACHE | CLIENTS | PID | USER | LAST_ERROR | VERSION\n" -"Get server and other information: @var{cache} returns the number of cached " -"documents via a status message. @var{clients} returns the number of " -"connected clients via a status message. @var{pid} returns the process ID " -"number of the server via a data response. @var{VERSION} returns the server " -"version number and compile-time features with a data response with each " -"being space delimited. @var{LAST_ERROR} returns a detailed description of " -"the last failed command when available. @var{USER} returns the username or " -"@abbr{TLS} hash of the connected client. @xref{Status Messages}. \n" +#: src/commands.c:4747 +msgid "" +"KILL \n" +"Terminates the client identified by @var{thread_id} and releases any file " +"lock or other resources it has held. @xref{GETINFO} for details about " +"listing connected clients.\n" +msgstr "" + +#: src/commands.c:4754 +msgid "" +"GETINFO [--data] [--verbose] CACHE | CLIENTS | PID | USER | LAST_ERROR | " +"VERSION\n" +"Get server and other information: @var{CACHE} returns the number of cached " +"documents via a status message. @var{CLIENTS} returns the number of " +"connected clients via a status message or a list of connected clients when " +"the @option{--verbose} parameter is used. The list contains space delimited " +"fields: the thread ID, client name, opened file (@code{/} if none opened), " +"file lock status, whether the current client is self, client state and user " +"ID or TLS fingerprint of the connected client. Client state @code{0} is an " +"unknown client state, @code{1} indicates the client has connected but hasn't " +"completed initializing, @code{2} indicates that the client is idle, @code{3} " +"means the client is in a command and @code{4} means the client is " +"disconnecting. This line is always returned with a data response. @var{PID} " +"returns the process ID number of the server via a data response. " +"@var{VERSION} returns the server version number and compile-time features " +"with a data response with each being space delimited. @var{LAST_ERROR} " +"returns a detailed description of the last failed command when available. " +"@var{USER} returns the username or @abbr{TLS} hash of the connected client. " +"@xref{Status Messages}. \n" "When the @option{--data} option is specified then the result will be sent " "via a data response rather than a status message." msgstr "" -#: src/commands.c:4568 +#: src/commands.c:4778 msgid "" "PASSWD [--reset] [--s2k-count=N] [--no-passphrase]\n" "Changes the passphrase of the secret key required to open the current file " @@ -369,7 +388,7 @@ msgid "" "Control})." msgstr "" -#: src/commands.c:4589 +#: src/commands.c:4799 msgid "" "KEYGRIP [--sign] \n" "Returns the hex encoded keygrip of the specified @var{filename} with a data " @@ -380,7 +399,7 @@ msgid "" "GPG_ERR_NOT_SUPPORTED." msgstr "" -#: src/commands.c:4601 +#: src/commands.c:4811 msgid "" "OPEN [--lock] []\n" "Opens @var{filename} using @var{passphrase}. When the filename is not found " @@ -394,7 +413,7 @@ msgid "" "has been opened." msgstr "" -#: src/commands.c:4616 +#: src/commands.c:4826 msgid "" "SAVE [--no-passphrase] [--reset] [--no-agent] [--s2k-count=N] [--" "cipher=] [--cipher-iterations=N] [--inquire-keyparam] [--" @@ -442,7 +461,7 @@ msgid "" "effect with symmetrically encrypted data files." msgstr "" -#: src/commands.c:4669 +#: src/commands.c:4879 msgid "" "ISCACHED [--lock] \n" "An @emph{OK} response is returned if the specified @var{filename} is found " @@ -455,13 +474,13 @@ msgid "" "command." msgstr "" -#: src/commands.c:4682 +#: src/commands.c:4892 msgid "" "CLEARCACHE []\n" "Clears a file cache entry for all or the specified @var{filename}." msgstr "" -#: src/commands.c:4687 +#: src/commands.c:4897 msgid "" "CACHETIMEOUT \n" "The time in @var{seconds} until @var{filename} will be removed from the " @@ -470,7 +489,7 @@ msgid "" "@pxref{SAVE}). @xref{Configuration}, and the @code{cache_timeout} parameter." msgstr "" -#: src/commands.c:4696 +#: src/commands.c:4906 msgid "" "LIST [--inquire] [--no-recurse] [--verbose] [--with-target] [--all] " "[[!]element[[!]child[..]]]\n" @@ -505,7 +524,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4734 +#: src/commands.c:4944 msgid "" "REALPATH [--inquire] [!]element[[!]child[..]]\n" "Resolves all @code{target} attributes of the specified element path and " @@ -515,7 +534,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4743 +#: src/commands.c:4953 msgid "" "STORE [!]element[[!]child[..]][content]\n" "This command uses a server @emph{INQUIRE} to retrieve data from the client.\n" @@ -533,7 +552,7 @@ msgid "" "to prevent @abbr{XML} parsing and @command{pwmd} syntax errors." msgstr "" -#: src/commands.c:4762 +#: src/commands.c:4972 msgid "" "RENAME [--inquire] [!]element[[!]child[..]] \n" "Renames the specified @var{element} to the new @var{value}. If an element of " @@ -542,7 +561,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4771 +#: src/commands.c:4981 msgid "" "COPY [--inquire] [!]source[[!]child[..]] [!]dest[[!]child[..]]\n" "Copies the entire element tree starting from the child node of the source " @@ -556,7 +575,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4787 +#: src/commands.c:4997 msgid "" "MOVE [--inquire] [!]source[[!]child[..]] [[!]dest[[!]child[..]]]\n" "Moves the source element path to the destination element path. If the " @@ -568,7 +587,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4799 +#: src/commands.c:5009 msgid "" "DELETE [--inquire] [!]element[[!]child[..]]\n" "Removes the specified element path and all of its children. This may break " @@ -578,7 +597,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4809 +#: src/commands.c:5019 msgid "" "GET [--inquire] [!]element[[!]child[..]]\n" "Retrieves the content of the specified element. The content is returned with " @@ -587,7 +606,7 @@ msgid "" "arguments are retrieved via a server @emph{INQUIRE}." msgstr "" -#: src/commands.c:4818 +#: src/commands.c:5028 msgid "" "ATTR [--inquire] SET|GET|DELETE|LIST [] " "[!]element[[!]child[..]] ..\n" @@ -620,7 +639,7 @@ msgid "" "@xref{Target Attribute}, for details about this special attribute." msgstr "" -#: src/commands.c:4855 +#: src/commands.c:5065 msgid "" "XPATH [--inquire] [[value]]\n" "Evaluates an XPath @var{expression}. If no @var{value} argument is specified " @@ -640,7 +659,7 @@ msgid "" "expression syntax." msgstr "" -#: src/commands.c:4878 +#: src/commands.c:5088 msgid "" "XPATHATTR [--inquire] SET|DELETE [[]]\n" "Like the @code{XPATH} command (@pxref{XPATH}) but operates on element " @@ -658,7 +677,7 @@ msgid "" "expression syntax." msgstr "" -#: src/commands.c:4899 +#: src/commands.c:5109 msgid "" "IMPORT [--root [!]element[[!]child[..]]] \n" "This command uses a server @emph{INQUIRE} to retrieve data from the client.\n" @@ -671,14 +690,14 @@ msgid "" "for details." msgstr "" -#: src/commands.c:4913 +#: src/commands.c:5123 msgid "" "DUMP\n" "Shows the in memory @abbr{XML} document with indenting. @xref{XPATH}, for " "dumping a specific node." msgstr "" -#: src/commands.c:4919 +#: src/commands.c:5129 msgid "" "LOCK\n" "Locks the mutex associated with the opened file. This prevents other clients " @@ -687,7 +706,7 @@ msgid "" "@xref{UNLOCK}." msgstr "" -#: src/commands.c:4927 +#: src/commands.c:5137 msgid "" "UNLOCK\n" "Unlocks the file mutex which was locked with the @code{LOCK} command or a " @@ -695,7 +714,7 @@ msgid "" "@pxref{ISCACHED})." msgstr "" -#: src/commands.c:4934 +#: src/commands.c:5144 msgid "" "GETCONFIG [filename] \n" "Returns the value of a @command{pwmd} configuration @var{parameter} with a " @@ -705,7 +724,7 @@ msgid "" "with the @code{OPTION} command (@pxref{OPTION}) will be returned." msgstr "" -#: src/commands.c:4943 +#: src/commands.c:5153 msgid "" "OPTION =\n" "Sets a client option @var{name} to @var{value}. The value for an option is " @@ -745,7 +764,8 @@ msgid "" "dialog.\n" "@item NAME\n" "Associates the thread ID of the connection with the specified textual " -"representation. Useful for debugging log messages.\n" +"representation. Useful for debugging log messages. May not contain " +"whitespace.\n" "@item LOCK-TIMEOUT\n" "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 " @@ -755,20 +775,20 @@ msgid "" "An integer specifiying the logging level.@end table\n" msgstr "" -#: src/commands.c:4997 +#: src/commands.c:5207 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:5003 +#: src/commands.c:5213 msgid "" "RESET\n" "Closes the currently opened file but keeps any previously set client options." msgstr "" -#: src/commands.c:5008 +#: src/commands.c:5218 msgid "" "NOP\n" "Does nothing. Always returns successfully." @@ -789,43 +809,39 @@ msgstr "" msgid "Decrypting ...\n" msgstr "" -#: src/xml.c:1637 src/xml.c:1724 +#: src/xml.c:1639 src/xml.c:1726 #, c-format msgid "" "An existing \"_name\" attribute already exists. Please rename this attribute " "before converting. Path is: %s" msgstr "" -#: src/xml.c:1711 +#: src/xml.c:1713 #, c-format msgid "" "An existing \"element\" already exists. Please rename this element before " "converting. Path is: %s" msgstr "" -#: src/xml.c:1772 +#: src/xml.c:1774 msgid "Converting pre 2.12 data file..." msgstr "" -#: src/xml.c:1796 +#: src/xml.c:1798 #, c-format msgid "Missing attribute '_name' at %s." msgstr "" -#: src/xml.c:1805 +#: src/xml.c:1807 #, c-format msgid "'%s' is not a valid element name at %s." msgstr "" -#: src/xml.c:1827 +#: src/xml.c:1829 #, c-format msgid "Warning: unknown element '%s' at %s. Ignoring." msgstr "" -#: src/tls.c:94 -msgid "client certificate is invalid" -msgstr "" - #: src/tls.c:97 msgid "client certificate is revoked" msgstr "" @@ -835,13 +851,25 @@ msgid "client certificate has no signer" msgstr "" #: src/tls.c:103 -msgid "client certificate signer is not from CA" +msgid "client certificate signature verification failed" msgstr "" #: src/tls.c:106 +msgid "client certificate expired" +msgstr "" + +#: src/tls.c:109 +msgid "client certificate signer is not from CA" +msgstr "" + +#: src/tls.c:112 msgid "client certificate has insecure algorithm" msgstr "" -#: src/tls.c:356 +#: src/tls.c:115 +msgid "client certificate is invalid" +msgstr "" + +#: src/tls.c:374 msgid "Generating key exchange parameters..." msgstr "" -- 2.11.4.GIT