* configure.in, debian/control: New upstream gettext. Since we had

    to change our build, to comply with the new upstream, we also
    need to modify the build-depends.
  * po/dpkg.pot, po/nl.po: Fixed broken translations.

diff --git a/ChangeLog b/ChangeLog
index edf4147e9a58c7aed7907f36e4e2bde2d3948137..94f9d84624edcd60466314e00b8d5debde5a3e4b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Apr 18 13:15:08 CDT 2001 Adam Heath <doogie@debian.org>
+
+  * configure.in, debian/control: New upstream gettext.  Since we had
+    to change our build, to comply with the new upstream, we also
+    need to modify the build-depends.
+  * po/dpkg.pot, po/nl.po: Fixed broken translations.
+
 Wed Apr 18 18:01:21 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/install-info.{8,pl}: modify install-info to take relative

diff --git a/configure.in b/configure.in
index 305d5124b56a7f5d5c0d092408ea535d7ce8c194..7127c67609ccfc32b07418cf2b5d5a5b52278dbd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -192,4 +192,4 @@ main/Makefile
 dselect/Makefile
 methods/Makefile
 utils/Makefile
-po/Makefile.in)
+po/Makefile:po/Makefile.in.in)

diff --git a/debian/control b/debian/control
index 736ca936da062abde54e2e1415a1771c6f2931fc..c5c593905b31ef7821b876ffb6f804e0cad3002c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Wichert Akkerman <wakkerma@debian.org>
 Origin: debian
 Bugs: debbugs://bugs.debian.org
 Standards-Version: 3.1.0
-Build-Depends: debiandoc-sgml, libncurses-dev, gettext, zlib1g-dev
+Build-Depends: debiandoc-sgml, libncurses-dev, gettext (>= 0.10.36), zlib1g-dev
 
 Package: dpkg
 Architecture: any

diff --git a/po/dpkg.pot b/po/dpkg.pot
index 67324a20c7c5b43ee2c2dbdf35c9dc85483ec272..4844d2b79b30bdbf6b24d572fbca5519047495b3 100644 (file)
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -6,13 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-09 21:27+0100\n"
+"POT-Creation-Date: 2001-04-18 12:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
 #: lib/compat.c:46
 msgid "unable to open tmpfile for vsnprintf"
@@ -56,12 +56,12 @@ msgstr ""
 msgid "Signal no.%d"
 msgstr ""
 
-#: lib/database.c:237
+#: lib/database.c:239
 #, c-format
 msgid "size %7d occurs %5d times\n"
 msgstr ""
 
-#: lib/database.c:238
+#: lib/database.c:240
 msgid "failed write during hashreport"
 msgstr ""
 
@@ -502,12 +502,12 @@ msgstr ""
 msgid "unknown data type `%i' in buffer_read\n"
 msgstr ""
 
-#: lib/mlib.c:268
+#: lib/mlib.c:270
 #, c-format
 msgid "failed to allocate buffer in buffer_copy (%s)"
 msgstr ""
 
-#: lib/mlib.c:299
+#: lib/mlib.c:301
 #, c-format
 msgid "failed in buffer_copy (%s)"
 msgstr ""
@@ -773,8 +773,8 @@ msgstr ""
 #: main/archives.c:260
 #, c-format
 msgid ""
-"trying to overwrite `%.250s', which is the diverted version of "
-"`%.250s'%.10s%.100s%.10s"
+"trying to overwrite `%.250s', which is the diverted version of `%.250s'%.10s"
+"%.100s%.10s"
 msgstr ""
 
 #: main/archives.c:264
@@ -1320,8 +1320,8 @@ msgstr ""
 #: main/configure.c:529
 #, c-format
 msgid ""
-"dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= "
-"`%s')\n"
+"dpkg: %s: warning - conffile `%.250s' is not a plain file or symlink (= `%"
+"s')\n"
 msgstr ""
 
 #: main/configure.c:543
@@ -1425,23 +1425,23 @@ msgstr ""
 msgid "  %.250s is not installed.\n"
 msgstr ""
 
-#: main/depcon.c:352
+#: main/depcon.c:353
 #, c-format
 msgid "  %.250s (version %.250s) is to be installed.\n"
 msgstr ""
 
-#: main/depcon.c:366
+#: main/depcon.c:367
 #, c-format
 msgid "  %.250s (version %.250s) is %s.\n"
 msgstr ""
 
 #. conflicts and provides the same
-#: main/depcon.c:391
+#: main/depcon.c:393
 #, c-format
 msgid "  %.250s provides %.250s and is to be installed.\n"
 msgstr ""
 
-#: main/depcon.c:422
+#: main/depcon.c:426
 #, c-format
 msgid "  %.250s provides %.250s and is %s.\n"
 msgstr ""
@@ -1739,152 +1739,152 @@ msgid ""
 " "
 msgstr ""
 
-#: main/filesdb.c:125
+#: main/filesdb.c:126
 #, c-format
 msgid "unable to open files list file for package `%.250s'"
 msgstr ""
 
-#: main/filesdb.c:130
+#: main/filesdb.c:131
 #, c-format
 msgid ""
 "dpkg: serious warning: files list file for package `%.250s' missing, "
 "assuming package has no files currently installed.\n"
 msgstr ""
 
-#: main/filesdb.c:145
+#: main/filesdb.c:146
 #, c-format
 msgid "files list for package `%.250s'"
 msgstr ""
 
-#: main/filesdb.c:158
+#: main/filesdb.c:159
 #, c-format
 msgid "files list file for package `%.250s' contains empty filename"
 msgstr ""
 
-#: main/filesdb.c:169
+#: main/filesdb.c:170
 #, c-format
 msgid "error closing files list file for package `%.250s'"
 msgstr ""
 
-#: main/filesdb.c:171
+#: main/filesdb.c:172
 #, c-format
 msgid "files list file for package `%.250s' is truncated"
 msgstr ""
 
-#: main/filesdb.c:202
+#: main/filesdb.c:203
 msgid "(Reading database ... "
 msgstr ""
 
-#: main/filesdb.c:210
+#: main/filesdb.c:211
 #, c-format
 msgid "%d files and directories currently installed.)\n"
 msgstr ""
 
-#: main/filesdb.c:241
+#: main/filesdb.c:242
 #, c-format
 msgid "unable to create updated files list file for package %s"
 msgstr ""
 
-#: main/filesdb.c:251
+#: main/filesdb.c:252
 #, c-format
 msgid "failed to write to updated files list file for package %s"
 msgstr ""
 
-#: main/filesdb.c:253
+#: main/filesdb.c:254
 #, c-format
 msgid "failed to flush updated files list file for package %s"
 msgstr ""
 
-#: main/filesdb.c:255
+#: main/filesdb.c:256
 #, c-format
 msgid "failed to sync updated files list file for package %s"
 msgstr ""
 
-#: main/filesdb.c:258
+#: main/filesdb.c:259
 #, c-format
 msgid "failed to close updated files list file for package %s"
 msgstr ""
 
-#: main/filesdb.c:260
+#: main/filesdb.c:261
 #, c-format
 msgid "failed to install updated files list file for package %s"
 msgstr ""
 
-#: main/filesdb.c:324
+#: main/filesdb.c:325
 msgid "failed to open statoverride file"
 msgstr ""
 
-#: main/filesdb.c:328
+#: main/filesdb.c:329
 msgid "failed to fstat statoverride file"
 msgstr ""
 
-#: main/filesdb.c:331
+#: main/filesdb.c:332
 msgid "failed to fstat previous statoverride file"
 msgstr ""
 
-#: main/filesdb.c:343
+#: main/filesdb.c:344
 #, c-format
 msgid "statoverride file `%.250s'"
 msgstr ""
 
-#: main/filesdb.c:356
+#: main/filesdb.c:357
 msgid "statoverride file contains empty line"
 msgstr ""
 
-#: main/filesdb.c:441
+#: main/filesdb.c:442
 msgid "failed to open diversions file"
 msgstr ""
 
-#: main/filesdb.c:445
+#: main/filesdb.c:446
 msgid "failed to fstat previous diversions file"
 msgstr ""
 
-#: main/filesdb.c:447
+#: main/filesdb.c:448
 msgid "failed to fstat diversions file"
 msgstr ""
 
-#: main/filesdb.c:469
+#: main/filesdb.c:470
 msgid "fgets gave an empty string from diversions [i]"
 msgstr ""
 
-#: main/filesdb.c:470
+#: main/filesdb.c:471
 msgid "diversions file has too-long line or EOF [i]"
 msgstr ""
 
-#: main/filesdb.c:476
+#: main/filesdb.c:477
 msgid "read error in diversions [ii]"
 msgstr ""
 
-#: main/filesdb.c:477
+#: main/filesdb.c:478
 msgid "unexpected EOF in diversions [ii]"
 msgstr ""
 
-#: main/filesdb.c:480
+#: main/filesdb.c:481
 msgid "fgets gave an empty string from diversions [ii]"
 msgstr ""
 
-#: main/filesdb.c:481 main/filesdb.c:492
+#: main/filesdb.c:482 main/filesdb.c:493
 msgid "diversions file has too-long line or EOF [ii]"
 msgstr ""
 
-#: main/filesdb.c:487
+#: main/filesdb.c:488
 msgid "read error in diversions [iii]"
 msgstr ""
 
-#: main/filesdb.c:488
+#: main/filesdb.c:489
 msgid "unexpected EOF in diversions [iii]"
 msgstr ""
 
-#: main/filesdb.c:491
+#: main/filesdb.c:492
 msgid "fgets gave an empty string from diversions [iii]"
 msgstr ""
 
-#: main/filesdb.c:499
+#: main/filesdb.c:500
 #, c-format
 msgid "conflicting diversions involving `%.250s' or `%.250s'"
 msgstr ""
 
-#: main/filesdb.c:508
+#: main/filesdb.c:509
 msgid "read error in diversions [i]"
 msgstr ""
 
@@ -2078,6 +2078,7 @@ msgid ""
 "installed\n"
 "  -B|--auto-deconfigure      Install even if it would break some other "
 "package\n"
+"  --no-debsign               Do no try to verify package signatures\n"
 "  --no-act                   Just say what we would do - don't do it\n"
 "  -D|--debug=<octal>         Enable debugging - see -Dhelp or --debug=help\n"
 "  --status-fd <n>            Send status change updates to file descriptor "
@@ -2095,7 +2096,7 @@ msgid ""
 "Use `dselect' for user-friendly package management.\n"
 msgstr ""
 
-#: main/main.c:119
+#: main/main.c:120
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use dselect for user-friendly package management;\n"
@@ -2109,17 +2110,17 @@ msgid ""
 "`more' !"
 msgstr ""
 
-#: dpkg-deb/main.c:135 main/main.c:182 split/main.c:142
+#: dpkg-deb/main.c:135 main/main.c:183 split/main.c:142
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr ""
 
-#: main/main.c:187
+#: main/main.c:188
 #, c-format
 msgid "Warning: obselete option `--%s'\n"
 msgstr ""
 
-#: main/main.c:195
+#: main/main.c:196
 #, c-format
 msgid ""
 "%s debugging option, --debug=<octal> or -D<octal>:\n"
@@ -2140,26 +2141,26 @@ msgid ""
 "Note that the meanings and values are subject to change.\n"
 msgstr ""
 
-#: main/main.c:214
+#: main/main.c:215
 msgid "--debug requires an octal argument"
 msgstr ""
 
-#: main/main.c:238
+#: main/main.c:239
 #, c-format
 msgid "null package name in --ignore-depends comma-separated list `%.250s'"
 msgstr ""
 
-#: main/main.c:244
+#: main/main.c:245
 #, c-format
 msgid "--ignore-depends requires a legal package name. `%.250s' is not; %s"
 msgstr ""
 
-#: main/main.c:260 main/main.c:278
+#: main/main.c:261 main/main.c:279
 #, c-format
 msgid "invalid integer for --%s: `%.250s'"
 msgstr ""
 
-#: main/main.c:288
+#: main/main.c:289
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -2200,38 +2201,38 @@ msgid ""
 "Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: main/main.c:333
+#: main/main.c:334
 #, c-format
 msgid "unknown force/refuse option `%.*s'"
 msgstr ""
 
-#: main/main.c:419
+#: main/main.c:421
 msgid "failed to exec dpkg-deb"
 msgstr ""
 
-#: main/main.c:431
+#: main/main.c:433
 msgid "--command-fd takes 1 argument, not 0"
 msgstr ""
 
-#: main/main.c:432
+#: main/main.c:434
 msgid "--command-fd only takes 1 argument"
 msgstr ""
 
-#: main/main.c:434
+#: main/main.c:436
 msgid "invalid number for --command-fd"
 msgstr ""
 
-#: main/main.c:436
+#: main/main.c:438
 #, c-format
 msgid "couldn't open `%i' for stream"
 msgstr ""
 
-#: main/main.c:461
+#: main/main.c:463
 #, c-format
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: dpkg-deb/main.c:155 main/main.c:500 main/main.c:544 split/main.c:163
+#: dpkg-deb/main.c:156 main/main.c:502 main/main.c:547 split/main.c:163
 msgid "need an action option"
 msgstr ""
 
@@ -2319,183 +2320,181 @@ msgstr ""
 msgid "reassembled package file"
 msgstr ""
 
-#. Verify the package.
-#. We have verifier
-#: main/processarc.c:142
+#: main/processarc.c:141
 #, c-format
 msgid "Authenticating %s ...\n"
 msgstr ""
 
-#: main/processarc.c:147
+#: main/processarc.c:146
 msgid "failed to execl debsig-verify"
 msgstr ""
 
-#: main/processarc.c:153
+#: main/processarc.c:152
 #, c-format
 msgid "Verification on package %s failed!"
 msgstr ""
 
-#: main/processarc.c:155
+#: main/processarc.c:154
 #, c-format
 msgid ""
 "Verification on package %s failed,\n"
 "but installing anyway as you request.\n"
 msgstr ""
 
-#: main/processarc.c:158
+#: main/processarc.c:157
 msgid "passed\n"
 msgstr ""
 
-#: main/processarc.c:166
+#: main/processarc.c:165
 msgid "unable to get unique filename for control info"
 msgstr ""
 
-#: main/processarc.c:188
+#: main/processarc.c:187
 msgid "failed to exec dpkg-deb to extract control information"
 msgstr ""
 
-#: main/processarc.c:204
+#: main/processarc.c:203
 #, c-format
 msgid "Recorded info about %s from %s.\n"
 msgstr ""
 
-#: main/processarc.c:213
+#: main/processarc.c:212
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
 msgstr ""
 
-#: main/processarc.c:264
+#: main/processarc.c:263
 #, c-format
 msgid ""
 "dpkg: regarding %s containing %s, pre-dependency problem:\n"
 "%s"
 msgstr ""
 
-#: main/processarc.c:267
+#: main/processarc.c:266
 #, c-format
 msgid "pre-dependency problem - not installing %.250s"
 msgstr ""
 
-#: main/processarc.c:268
+#: main/processarc.c:267
 msgid "dpkg: warning - ignoring pre-dependency problem !\n"
 msgstr ""
 
-#: main/processarc.c:282
+#: main/processarc.c:281
 #, c-format
 msgid "Preparing to replace %s %s (using %s) ...\n"
 msgstr ""
 
-#: main/processarc.c:287
+#: main/processarc.c:286
 #, c-format
 msgid "Unpacking %s (from %s) ...\n"
 msgstr ""
 
-#: main/processarc.c:307
+#: main/processarc.c:306
 #, c-format
 msgid "name of conffile (starting `%.250s') is too long (>%d characters)"
 msgstr ""
 
-#: main/processarc.c:361
+#: main/processarc.c:360
 #, c-format
 msgid "read error in %.250s"
 msgstr ""
 
 #. conff= fopen()
-#: main/processarc.c:363
+#: main/processarc.c:362
 #, c-format
 msgid "error closing %.250s"
 msgstr ""
 
-#: main/processarc.c:365
+#: main/processarc.c:364
 #, c-format
 msgid "error trying to open %.250s"
 msgstr ""
 
-#: main/processarc.c:398
+#: main/processarc.c:397
 #, c-format
 msgid "De-configuring %s, so that we can remove %s ...\n"
 msgstr ""
 
-#: main/processarc.c:456
+#: main/processarc.c:455
 #, c-format
 msgid "Unpacking replacement %.250s ...\n"
 msgstr ""
 
-#: main/processarc.c:535
+#: main/processarc.c:534
 msgid "unable to exec dpkg-deb to get filesystem archive"
 msgstr ""
 
-#: main/processarc.c:548
+#: main/processarc.c:547
 msgid "error reading dpkg-deb tar output"
 msgstr ""
 
-#: main/processarc.c:550
+#: main/processarc.c:549
 msgid "corrupted filesystem tarfile - corrupted package archive"
 msgstr ""
 
-#: main/processarc.c:553
+#: main/processarc.c:552
 msgid "dpkg-deb: zap possible trailing zeros"
 msgstr ""
 
-#: main/processarc.c:645
+#: main/processarc.c:644
 #, c-format
 msgid "dpkg: warning - unable to delete old file `%.250s': %s\n"
 msgstr ""
 
-#: main/processarc.c:667 main/processarc.c:902 main/remove.c:287
+#: main/processarc.c:666 main/processarc.c:901 main/remove.c:287
 msgid "cannot read info directory"
 msgstr ""
 
-#: main/processarc.c:680
+#: main/processarc.c:679
 #, c-format
 msgid "old version of package has overly-long info file name starting `%.250s'"
 msgstr ""
 
-#: main/processarc.c:692
+#: main/processarc.c:691
 #, c-format
 msgid "unable to remove obsolete info file `%.250s'"
 msgstr ""
 
-#: main/processarc.c:695
+#: main/processarc.c:694
 #, c-format
 msgid "unable to install (supposed) new info file `%.250s'"
 msgstr ""
 
-#: main/processarc.c:702
+#: main/processarc.c:701
 msgid "unable to open temp control directory"
 msgstr ""
 
-#: main/processarc.c:711
+#: main/processarc.c:710
 #, c-format
 msgid "package contains overly-long control info file name (starting `%.50s')"
 msgstr ""
 
-#: main/processarc.c:716
+#: main/processarc.c:715
 #, c-format
 msgid "package control info contained directory `%.250s'"
 msgstr ""
 
-#: main/processarc.c:718
+#: main/processarc.c:717
 #, c-format
 msgid "package control info rmdir of `%.250s' didn't say not a dir"
 msgstr ""
 
-#: main/processarc.c:724
+#: main/processarc.c:723
 #, c-format
 msgid "dpkg: warning - package %s contained list as info file"
 msgstr ""
 
-#: main/processarc.c:731
+#: main/processarc.c:730
 #, c-format
 msgid "unable to install new info file `%.250s' as `%.250s'"
 msgstr ""
 
-#: main/processarc.c:882
+#: main/processarc.c:881
 #, c-format
 msgid "(Noting disappearance of %s, which has been completely replaced.)\n"
 msgstr ""
 
-#: main/processarc.c:918
+#: main/processarc.c:917
 #, c-format
 msgid "unable to delete disappearing control info file `%.250s'"
 msgstr ""
@@ -2561,8 +2560,8 @@ msgstr ""
 #: main/remove.c:252
 #, c-format
 msgid ""
-"dpkg - warning: while removing %.250s, unable to remove directory `%.250s': "
-"%s - directory may be a mount point ?\n"
+"dpkg - warning: while removing %.250s, unable to remove directory `%.250s': %"
+"s - directory may be a mount point ?\n"
 msgstr ""
 
 #: main/remove.c:259
@@ -3416,8 +3415,8 @@ msgid ""
 "       dpkg-split -j|--join <part> <part> ...      Join parts together.\n"
 "       dpkg-split -I|--info <part> ...             Display info about a "
 "part.\n"
-"       dpkg-split -h|--help|--version|--licence    Show "
-"help/version/licence.\n"
+"       dpkg-split -h|--help|--version|--licence    Show help/version/"
+"licence.\n"
 "\n"
 "       dpkg-split -a|--auto -o <complete> <part>   Auto-accumulate parts.\n"
 "       dpkg-split -l|--listq                       List unmatched pieces.\n"
@@ -3426,8 +3425,8 @@ msgid ""
 "\n"
 "Options:  --depotdir <directory>  (default is %s/%s)\n"
 "          -S|--partsize <size>    (in Kb, for -s, default is 450)\n"
-"          -o|--output <file>      (for -j, default is "
-"<package>-<version>.deb)\n"
+"          -o|--output <file>      (for -j, default is <package>-<version>."
+"deb)\n"
 "          -Q|--npquiet            (be quiet when -a is not a part)\n"
 "          --msdos                 (generate 8.3 filenames)\n"
 "\n"
@@ -3766,6 +3765,7 @@ msgid "keybindings"
 msgstr ""
 
 #: dselect/baselist.cc:299
+#, c-format
 msgid "  -- %d%%, press "
 msgstr ""
 
@@ -4075,11 +4075,11 @@ msgid ""
 "Read-only access: only preview of selections is available!"
 msgstr ""
 
-#: dselect/main.cc:265
+#: dselect/main.cc:268
 msgid "failed to getch in main menu"
 msgstr ""
 
-#: dselect/main.cc:332
+#: dselect/main.cc:335
 #, c-format
 msgid "unknown action string `%.50s'"
 msgstr ""

diff --git a/po/nl.po b/po/nl.po
index 68f2c40b10f50786f7e8a40c66e4d7776476b774..0b113389be336d3a32d8648b62dd19b79baf1804 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -5075,7 +5075,7 @@ msgstr ""
 "informatie zichtbaar over dat pakket.\n"
 "U kunt `o' en `O' gebruiken om de sorteervolgorde te veranderen en\n"
 "krijgt u de mogelijkheid om verschillende groepen pakketten te\n"
-"markeren.\n"
+"markeren."
 
 #: dselect/pkginfo.cc:94
 msgid "interrelationships affecting "
@@ -5543,7 +5543,7 @@ msgid ""
 "  information display or expand it to use almost all of the screen.\n"
 msgstr ""
 "* Oplichten: Een pakket in de lijst wordt opgelicht.  Het geeft aan welk "
-"pakket(ten) "
+"pakket(ten)\n"
 
 #: dselect/helpmsgs.cc:148
 msgid "Introduction to method selection display"