From bd10db942ceb4e9ed68e0169cf141c67a0d1729c Mon Sep 17 00:00:00 2001 From: Adam Heath Date: Sun, 14 Jan 2001 08:46:52 +0000 Subject: [PATCH] Bring up to date. --- ChangeLog | 4 ++ po/dpkg.pot | 153 +++++++++++++++++++++++++++++----------------------- 2 files changed, 91 insertions(+), 66 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36533e79..3f7657ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jan 14 02:46:14 CST 2001 Adam Heath + + * po/dpkg.pot: Bring up to date. + Sun Jan 14 02:37:05 CST 2001 Adam Heath * main/cleanup.c, main/help.c, main/processarc.c: Removed duplicate diff --git a/po/dpkg.pot b/po/dpkg.pot index 94efaea1..8dea0a13 100644 --- a/po/dpkg.pot +++ b/po/dpkg.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-01-01 02:02-0600\n" +"POT-Creation-Date: 2001-01-14 02:41-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -125,32 +125,32 @@ msgstr "" msgid "failed to remove my own update file %.255s" msgstr "" -#: lib/dbmodify.c:230 +#: lib/dbmodify.c:247 #, c-format msgid "unable to write updated status of `%.250s'" msgstr "" -#: lib/dbmodify.c:232 +#: lib/dbmodify.c:249 #, c-format msgid "unable to flush updated status of `%.250s'" msgstr "" -#: lib/dbmodify.c:234 +#: lib/dbmodify.c:251 #, c-format msgid "unable to truncate for updated status of `%.250s'" msgstr "" -#: lib/dbmodify.c:236 +#: lib/dbmodify.c:253 #, c-format msgid "unable to fsync updated status of `%.250s'" msgstr "" -#: lib/dbmodify.c:238 +#: lib/dbmodify.c:255 #, c-format msgid "unable to close updated status of `%.250s'" msgstr "" -#: lib/dbmodify.c:241 +#: lib/dbmodify.c:258 #, c-format msgid "unable to install updated status of `%.250s'" msgstr "" @@ -437,67 +437,77 @@ msgstr "" msgid "failed to create pipe" msgstr "" -#: lib/mlib.c:109 +#: lib/mlib.c:110 #, c-format -msgid "subprocess %s returned error exit status %d" +msgid "dpkg: warning - %s returned error exit status %d\n" msgstr "" #: lib/mlib.c:112 #, c-format +msgid "subprocess %s returned error exit status %d" +msgstr "" + +#: lib/mlib.c:116 +#, c-format +msgid "dpkg: warning - %s killed by signal (%s)%s\n" +msgstr "" + +#: lib/mlib.c:119 +#, c-format msgid "subprocess %s killed by signal (%s)%s" msgstr "" -#: lib/mlib.c:115 +#: lib/mlib.c:122 #, c-format msgid "subprocess %s failed with wait status code %d" msgstr "" -#: lib/mlib.c:124 main/help.c:367 +#: lib/mlib.c:131 #, c-format msgid "wait for %s failed" msgstr "" -#: lib/mlib.c:172 +#: lib/mlib.c:179 #, c-format msgid "failed in buffer_write(fd) (%i, ret=%i, %s)" msgstr "" -#: lib/mlib.c:179 +#: lib/mlib.c:186 #, c-format msgid "eof in buffer_write(stream): %s" msgstr "" -#: lib/mlib.c:181 +#: lib/mlib.c:188 #, c-format msgid "error in buffer_write(stream): %s" msgstr "" -#: lib/mlib.c:187 +#: lib/mlib.c:194 #, c-format msgid "unknown data type `%i' in buffer_write\n" msgstr "" -#: lib/mlib.c:203 +#: lib/mlib.c:210 #, c-format msgid "failed in buffer_read(fd): %s" msgstr "" -#: lib/mlib.c:210 +#: lib/mlib.c:217 #, c-format msgid "error in buffer_read(stream): %s" msgstr "" -#: lib/mlib.c:213 +#: lib/mlib.c:220 #, c-format msgid "unknown data type `%i' in buffer_read\n" msgstr "" -#: lib/mlib.c:260 +#: lib/mlib.c:267 #, c-format msgid "failed to allocate buffer in buffer_copy (%s)" msgstr "" -#: lib/mlib.c:291 +#: lib/mlib.c:298 #, c-format msgid "failed in buffer_copy (%s)" msgstr "" @@ -733,7 +743,7 @@ msgstr "" msgid "cannot open GPL file " msgstr "" -#: lib/varbuf.c:103 +#: lib/varbuf.c:105 msgid "failed to realloc for variable buffer" msgstr "" @@ -993,27 +1003,27 @@ msgstr "" msgid "--%s needs at least one package archive file argument" msgstr "" -#: main/archives.c:835 +#: main/archives.c:839 #, c-format msgid "Selecting previously deselected package %s.\n" msgstr "" -#: main/archives.c:840 +#: main/archives.c:844 #, c-format msgid "Skipping deselected package %s.\n" msgstr "" -#: main/archives.c:854 +#: main/archives.c:858 #, c-format msgid "Version %.250s of %.250s already installed, skipping.\n" msgstr "" -#: main/archives.c:866 +#: main/archives.c:870 #, c-format msgid "%s - warning: downgrading %.250s from %.250s to %.250s.\n" msgstr "" -#: main/archives.c:872 +#: main/archives.c:876 #, c-format msgid "Will not downgrade %.250s from version %.250s to %.250s, skipping.\n" msgstr "" @@ -1938,80 +1948,65 @@ msgstr "" msgid "unable to set execute permissions on `%.250s'" msgstr "" -#: main/help.c:277 +#: main/help.c:293 #, c-format msgid "unable to stat installed %s script `%.250s'" msgstr "" -#: main/help.c:284 main/help.c:363 main/help.c:403 +#: main/help.c:295 main/help.c:355 main/help.c:375 #, c-format msgid "unable to execute %s" msgstr "" -#: main/help.c:314 +#: main/help.c:321 #, c-format msgid "unable to stat new %s script `%.250s'" msgstr "" -#: main/help.c:321 +#: main/help.c:323 #, c-format msgid "unable to execute new %s" msgstr "" -#: main/help.c:347 +#: main/help.c:344 #, c-format msgid "old %s script" msgstr "" -#: main/help.c:355 +#: main/help.c:352 #, c-format msgid "dpkg: warning - unable to stat %s `%.250s': %s\n" msgstr "" -#: main/help.c:371 -#, c-format -msgid "dpkg: warning - %s returned error exit status %d\n" -msgstr "" - -#: main/help.c:374 -#, c-format -msgid "dpkg: warning - %s killed by signal (%s)%s\n" -msgstr "" - -#: main/help.c:377 -#, c-format -msgid "%s failed with unknown wait status code %d" -msgstr "" - -#: main/help.c:381 +#: main/help.c:359 msgid "dpkg - trying script from the new package instead ...\n" msgstr "" -#: main/help.c:388 +#: main/help.c:366 #, c-format msgid "new %s script" msgstr "" -#: main/help.c:392 +#: main/help.c:370 msgid "there is no script in the new version of the package - giving up" msgstr "" -#: main/help.c:394 +#: main/help.c:372 #, c-format msgid "unable to stat %s `%.250s'" msgstr "" -#: main/help.c:408 +#: main/help.c:376 msgid "dpkg: ... it looks like that went OK.\n" msgstr "" #. Huh ? -#: main/help.c:503 +#: main/help.c:471 #, c-format msgid "failed to rmdir/unlink `%.255s'" msgstr "" -#: dpkg-deb/info.c:52 main/help.c:507 +#: dpkg-deb/info.c:52 main/help.c:475 msgid "failed to exec rm for cleanup" msgstr "" @@ -2045,6 +2040,8 @@ msgid "" " dpkg --update-avail replace available packages info\n" " dpkg --merge-avail merge with info from file\n" " dpkg --clear-avail erase existing available info\n" +" dpkg --command-fd pass commands in on this file " +"descriptor\n" " dpkg --forget-old-unavail forget uninstalled unavailable " "pkgs\n" " dpkg -s|--status ... display package status details\n" @@ -2085,6 +2082,8 @@ msgid "" "use\n" " --no-act Just say what we would do - don't do it\n" " -D|--debug= Enable debugging - see -Dhelp or --debug=help\n" +" --status-fd Send status change updates to file descriptor " +"\n" " --ignore-depends=,... Ignore dependencies involving \n" " --force-... Override problems - see --force-help\n" " --no-force-...|--refuse-... Stop when problems encountered\n" @@ -2098,7 +2097,7 @@ msgid "" "Use `dselect' for user-friendly package management.\n" msgstr "" -#: main/main.c:118 +#: main/main.c:120 msgid "" "Type dpkg --help for help about installing and deinstalling packages [*];\n" "Use dselect for user-friendly package management;\n" @@ -2112,17 +2111,17 @@ msgid "" "`more' !" msgstr "" -#: dpkg-deb/main.c:135 main/main.c:179 split/main.c:142 +#: dpkg-deb/main.c:135 main/main.c:181 split/main.c:142 #, c-format msgid "conflicting actions --%s and --%s" msgstr "" -#: main/main.c:184 +#: main/main.c:186 #, c-format msgid "Warning: obselete option `--%s'\n" msgstr "" -#: main/main.c:192 +#: main/main.c:194 #, c-format msgid "" "%s debugging option, --debug= or -D:\n" @@ -2143,26 +2142,26 @@ msgid "" "Note that the meanings and values are subject to change.\n" msgstr "" -#: main/main.c:211 +#: main/main.c:213 msgid "--debug requires an octal argument" msgstr "" -#: main/main.c:235 +#: main/main.c:237 #, c-format msgid "null package name in --ignore-depends comma-separated list `%.250s'" msgstr "" -#: main/main.c:241 +#: main/main.c:243 #, c-format msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s" msgstr "" -#: main/main.c:257 +#: main/main.c:259 main/main.c:277 #, c-format msgid "invalid integer for --%s: `%.250s'" msgstr "" -#: main/main.c:267 +#: main/main.c:287 #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -2201,16 +2200,38 @@ msgid "" "Forcing options marked [*] are enabled by default.\n" msgstr "" -#: main/main.c:311 +#: main/main.c:331 #, c-format msgid "unknown force/refuse option `%.*s'" msgstr "" -#: main/main.c:394 +#: main/main.c:417 msgid "failed to exec dpkg-deb" msgstr "" -#: dpkg-deb/main.c:155 main/main.c:431 split/main.c:163 +#: main/main.c:429 +msgid "--command-fd takes 1 argument, not 0" +msgstr "" + +#: main/main.c:430 +msgid "--command-fd only takes 1 argument" +msgstr "" + +#: main/main.c:432 +msgid "invalid number for --command-fd" +msgstr "" + +#: main/main.c:434 +#, c-format +msgid "couldn't open `%i' for stream" +msgstr "" + +#: main/main.c:456 +#, c-format +msgid "unexpected eof before end of line %d" +msgstr "" + +#: dpkg-deb/main.c:155 main/main.c:495 main/main.c:539 split/main.c:163 msgid "need an action option" msgstr "" -- 2.39.5