From 272c93cd93287866ef34b3e115e17857bed68848 Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Mon, 28 May 2012 10:35:18 -0400 Subject: [PATCH] Disable building of the English translation file. Since this is the default language. --- po/LINGUAS | 2 +- po/libpwmd.pot | 244 +++++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 168 insertions(+), 78 deletions(-) diff --git a/po/LINGUAS b/po/LINGUAS index ec292f0a..09d278f3 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -en@quot en@boldquot +#en@quot en@boldquot diff --git a/po/libpwmd.pot b/po/libpwmd.pot index 39a3b9f6..fdfeee67 100644 --- a/po/libpwmd.pot +++ b/po/libpwmd.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bjk@luxsci.net\n" -"POT-Creation-Date: 2011-06-05 21:16-0400\n" +"POT-Creation-Date: 2012-05-28 10:34-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,94 +17,128 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#: src/libpwmd.c:545 src/pwmc.c:380 src/pwmc.c:451 +msgid "Input is not from a terminal! Failing.\n" +msgstr "" + +#: src/libpwmd.c:567 src/pwmc.c:402 +#, c-format +msgid "Password for %s: " +msgstr "" + +#: src/libpwmd.c:570 src/pwmc.c:405 +#, c-format +msgid "Invalid password. Password for %s: " +msgstr "" + +#: src/libpwmd.c:574 src/pwmc.c:408 +#, c-format +msgid "New password for %s: " +msgstr "" + +#: src/libpwmd.c:577 src/pwmc.c:411 +msgid "Confirm password: " +msgstr "" + +#: src/libpwmd.c:650 +msgid "Passphrases do not match.\n" +msgstr "" + #: src/mem.c:107 src/mem.c:195 #, c-format msgid "%s: %p not found" msgstr "" -#: src/pinentry.c:218 +#: src/pinentry.c:123 msgid "it is WAY too short" msgstr "" -#: src/pinentry.c:220 +#: src/pinentry.c:125 msgid "it is too short" msgstr "" -#: src/pinentry.c:222 +#: src/pinentry.c:127 msgid "it is all whitespace" msgstr "" -#: src/pinentry.c:224 +#: src/pinentry.c:129 msgid "it is based on your username" msgstr "" -#: src/pinentry.c:226 +#: src/pinentry.c:131 msgid "it does not contain enough DIFFERENT characters" msgstr "" -#: src/pinentry.c:228 +#: src/pinentry.c:133 msgid "it is based on a dictionary word" msgstr "" -#: src/pinentry.c:230 +#: src/pinentry.c:135 msgid "it is based upon your password entry" msgstr "" -#: src/pinentry.c:232 +#: src/pinentry.c:137 msgid "it's derived from your password entry" msgstr "" -#: src/pinentry.c:234 +#: src/pinentry.c:139 msgid "it is derived from your password entry" msgstr "" -#: src/pinentry.c:236 +#: src/pinentry.c:141 msgid "it is based on a (reversed) dictionary word" msgstr "" -#: src/pinentry.c:238 +#: src/pinentry.c:143 msgid "it is derivable from your password entry" msgstr "" -#: src/pinentry.c:240 +#: src/pinentry.c:145 msgid "it's derivable from your password entry" msgstr "" -#: src/pinentry.c:242 +#: src/pinentry.c:147 msgid "it looks like a National Insurance number." msgstr "" -#: src/pinentry.c:244 +#: src/pinentry.c:149 msgid "it is too simplistic/systematic" msgstr "" -#: src/pinentry.c:264 +#: src/pinentry.c:175 msgid "Passphrase:" msgstr "" -#: src/pinentry.c:270 +#: src/pinentry.c:184 #, c-format msgid "" -"A passphrase is required to open the file \"%s\". Please enter the " -"passphrase below." +"A passphrase is required to unlock the secret key for the encrypted data " +"file \"%s\". Please enter the passphrase below." msgstr "" -#: src/pinentry.c:272 +#: src/pinentry.c:187 #, c-format -msgid "" -"A passphrase is required to save to the file \"%s\". Please enter the " -"passphrase below." +msgid "Please enter the passphrase to use to encrypt the data file \"%s\"." +msgstr "" + +#: src/pinentry.c:189 +msgid "Please re-enter the passphrase for confirmation." +msgstr "" + +#: src/pinentry.c:217 +msgid "Passphrases do not match, try again." msgstr "" -#: src/pinentry.c:292 -msgid "Invalid passphrase, please try again." +#: src/pinentry.c:222 +#, c-format +msgid "Bad passphrase (try %i of %i)" msgstr "" -#: src/pinentry.c:296 -msgid "Please type the passphrase again for confirmation." +#: src/pinentry.c:227 +msgid "Bad passphrase, try again" msgstr "" -#: src/pwmc.c:111 +#: src/pwmc.c:123 msgid "" "Read a PWMD protocol command from standard input.\n" "\n" @@ -112,23 +146,46 @@ msgid "" " --url \n" " a url string to connect to (see below)\n" " --no-ssh-agent\n" -" disable SSH agent (enabled when SSH_AGENT_PID is set)\n" +" disable SSH agent use (enabled when SSH_AUTH_SOCK is set)\n" " --identity, -i \n" " the ssh identity file to use for authentication\n" " --knownhosts, -k \n" " the ssh knownhosts file to use (~/.ssh/knownhosts)\n" +" --ssh-timeout \n" +" timeout before a remote command fails (0=disabled, default)\n" +" --ssh-keepalive \n" +" interval to send a keepalive to the remote server (0=disabled, " +"default)\n" +" --ca-cert \n" +" certificate authority (CA) used to sign the server cert\n" +" --client-cert \n" +" client certificate to use for authentication\n" +" --client-key \n" +" key file used to protect the client certificate\n" +" --tls-priority \n" +" compression, cipher and hash algorithm string (SECURE256)\n" +" --tls-verify\n" +" verify the hostname against the server certificate\n" +" --no-lock\n" +" do not lock the data file upon opening it\n" " --no-status\n" " disable showing of status messages from the server\n" " --name, -n \n" " set the client name\n" -" --passphrase, -P \n" -" passphrase to use when opening a file (disables pinentry use)\n" " --no-passphrase\n" " do not require a passphrase when saving a new file\n" " --keygrip \n" " the hex string of the keygrip to save to\n" +" --sign-keygrip \n" +" the hex string of the keygrip to sign with\n" " --key-file \n" -" obtain the passphrase from the specified filename (open only)\n" +" obtain the passphrase from the specified filename\n" +" --new-key-file \n" +" obtain the passphrase to save with from the specified filename\n" +" --s2k-count \n" +" the number of times to hash the passphrase for a new file\n" +" --cipher-iterations \n" +" the number of times to encrypt the XML data (N+1)\n" " --timeout \n" " pinentry timeout\n" " --tries \n" @@ -175,7 +232,7 @@ msgid "" " --help\n" msgstr "" -#: src/pwmc.c:179 +#: src/pwmc.c:217 msgid "" "\n" "An optional url may be in the form of:\n" @@ -185,41 +242,21 @@ msgid "" " --url ssh[46]://[username@]hostname[:port]\n" " --no-ssh-agent -i identity_file --url ssh[46]://[username@]hostname[:" "port]\n" +" or\n" +" --url tls[46]://hostname[:port]\n" msgstr "" -#: src/pwmc.c:206 -msgid "" -"------------------------------------------------------------------------------\n" -"Press CTRL-D to end. Press twice on a non-empty line. Pressing ENTER after\n" -"each line during the inquire will send that line including the newline\n" -"character.\n" -"------------------------------------------------------------------------------\n" -msgstr "" - -#: src/pwmc.c:278 src/pwmc.c:350 -msgid "Input is not from a terminal! Failing.\n" -msgstr "" - -#: src/pwmc.c:300 -#, c-format -msgid "Password for %s: " -msgstr "" - -#: src/pwmc.c:303 +#: src/pwmc.c:279 #, c-format -msgid "Invalid password. Password for %s: " +msgid "Using keyfile '%s' as %s.\n" msgstr "" -#: src/pwmc.c:306 +#: src/pwmc.c:307 #, c-format -msgid "New password for %s: " -msgstr "" - -#: src/pwmc.c:309 -msgid "Confirm password: " +msgid "Press CTRL-D to send the current line. Press twice to end. %s:\n" msgstr "" -#: src/pwmc.c:347 +#: src/pwmc.c:448 #, c-format msgid "" "Password Manager Daemon: %s\n" @@ -232,54 +269,107 @@ msgid "" "connections by adding %s's hostkey to the known hosts file?" msgstr "" -#: src/pwmc.c:375 +#: src/pwmc.c:476 msgid "Trust this connection [y/N]: " msgstr "" -#: src/pwmc.c:524 +#: src/pwmc.c:662 msgid "" "------------------------------------------------------------------------------\n" "Elements are TAB delimited. Press CTRL-V then TAB to insert from the " "prompt.\n" "\n" -"Type HELP for protocol command help (since pwmd 2.19). Press CTRL-D to " -"quit.\n" +"Type HELP for protocol commands. Type .help for pwmc commands. Press CTRL-D\n" +"to quit.\n" "------------------------------------------------------------------------------\n" msgstr "" -#: src/pwmc.c:544 +#: src/pwmc.c:709 +msgid "Usage: .read [args]\n" +msgstr "" + +#: src/pwmc.c:754 +msgid "Usage: .redir [args]\n" +msgstr "" + +#: src/pwmc.c:786 +msgid "" +"Type HELP for protocol commands. Available pwmc commands:\n" +"\n" +" .redir \n" +" redirect the output of a command to the specified file\n" +"\n" +" .open \n" +" open the specified filename losing any changes to the current one\n" +"\n" +" .read [args]\n" +" obtain data from the specified filename for an inquire command\n" +"\n" +" .set help | []\n" +" set option to \n" +"\n" +" .help\n" +" this help text\n" +msgstr "" + +#: src/pwmc.c:814 +msgid "Usage: .open \n" +msgstr "" + +#: src/pwmc.c:818 +#, c-format +msgid "Opening data file \"%s\" ...\n" +msgstr "" + +#: src/pwmc.c:858 +msgid "Usage: .set help | []\n" +msgstr "" + +#: src/pwmc.c:907 +msgid "" +"Set a libpwmd or pwmc option. The option name and optional value is space\n" +"delimited. When no value is specified the option is unset.\n" +"\n" +"keyfile []\n" +" set or unset the keyfile to be used when a passphrase is required\n" +"\n" +"new-keyfile []\n" +" set or unset the keyfile to be used when a new passphrase is required\n" +msgstr "" + +#: src/pwmc.c:957 msgid "WARNING: interactive mode doesn't use secure memory!\n" msgstr "" -#: src/pwmc.c:609 +#: src/pwmc.c:1030 msgid "(c)ancel/(f)orget password/(s)ave/(Q)uit/(S)ave and quit/(h)elp?: " msgstr "" -#: src/pwmc.c:647 +#: src/pwmc.c:1068 msgid "No filename was specified on the command line. Aborting.\n" msgstr "" -#: src/pwmc.c:653 +#: src/pwmc.c:1082 msgid "Saving changes ...\n" msgstr "" -#: src/pwmc.c:1003 -msgid "Connecting ...\n" +#: src/pwmc.c:1405 +#, c-format +msgid "%s: invalid argument for option '--%s'\n" msgstr "" -#: src/pwmc.c:1008 -msgid "Connected.\n" +#: src/pwmc.c:1463 +msgid "Connecting ...\n" msgstr "" -#: src/pwmc.c:1125 -#, c-format -msgid "Opening data file \"%s\" ...\n" +#: src/pwmc.c:1515 +msgid "Connected.\n" msgstr "" -#: src/pwmc.c:1234 +#: src/pwmc.c:1678 msgid "Connection closed.\n" msgstr "" -#: src/ssh.c:82 +#: src/ssh.c:89 msgid "libpwmd saying bye!" msgstr "" -- 2.11.4.GIT