rpm-gettext0.11.patch

   1 --- rpm-4.0.4/configure.in.wiget        Tue Jul  9 15:02:48 2002
   2 +++ rpm-4.0.4/configure.in      Tue Jul  9 15:08:14 2002
   3 @@ -1164,13 +1164,13 @@
   4
   5  AC_CONFIG_SUBDIRS(popt beecrypt zlib $WITH_DB_SUBDIR)
   6
   7 -AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
   8 +AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec m4/Makefile
   9         macros.perl scripts/perl.req scripts/perl.prov
  10         macros.python macros.php scripts/php.req scripts/php.prov
  11         rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
  12         scripts/Makefile scripts/brp-redhat tools/Makefile
  13         tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
  14 -       misc/Makefile po/Makefile.in intl/Makefile
  15 +       misc/Makefile po/Makefile.in
  16         doc/Makefile doc/manual/Makefile
  17         doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
  18         doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
  19 --- rpm-4.0.4/Makefile.am.wiget Mon Feb  4 20:12:44 2002
  20 +++ rpm-4.0.4/Makefile.am       Tue Jul  9 15:06:53 2002
  21 @@ -2,14 +2,14 @@
  22
  23  AUTOMAKE_OPTIONS = 1.4 foreign
  24
  25 -EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS README.amiga INSTALL \
  26 +EXTRA_DIST = config.rpath  CHANGES CREDITS Doxyheader GROUPS README.amiga INSTALL \
  27         RPM-GPG-KEY RPM-PGP-KEY \
  28         autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
  29         config.site db db3/configure gendiff installplatform platform* \
  30         Perl-RPM po/*.in po/*.po po/rpm.pot \
  31         rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
  32
  33 -SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
  34 +SUBDIRS = m4  po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
  35
  36  INCLUDES = \
  37         -I$(top_srcdir)/build \
  38 @@ -248,3 +248,5 @@
  39         @CSCOPE@ -b -R
  40
  41  cref: ctags cscope
  42 +
  43 +ACLOCAL_AMFLAGS = -I m4
  44 --- rpm-4.0.4/po/pt_BR.po.wiget Tue Jul  9 15:54:10 2002
  45 +++ rpm-4.0.4/po/pt_BR.po       Tue Jul  9 15:55:41 2002
  46 @@ -5,6 +5,12 @@
  47  msgstr ""
  48  "Project-Id-Version: rpm 4.0.3\n"
  49  "POT-Creation-Date: 2002-02-14 12:28-0500\n"
  50 +"PO-Revision-Date: 2000-06-22 01:13+01:00\n"
  51 +"Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
  52 +"Language-Team: none <none@example.com>\n"
  53 +"MIME-Version: 1.0\n"
  54 +"Content-Type: text/plain; charset=ISO-8859-1\n"
  55 +"Content-Transfer-Encoding: 8Bit\n"
  56
  57  # , c-format
  58  #: build.c:39
  59 --- rpm-4.0.4/po/cs.po.wiget    Tue Jul  9 15:32:35 2002
  60 +++ rpm-4.0.4/po/cs.po  Tue Jul  9 15:32:45 2002
  61 @@ -3110,7 +3110,7 @@
  62  #: lib/query.c:931
  63  #, c-format
  64  msgid "record %u could not be read\n"
  65 -msgstr "záznam %d nelze pøeèíst\n"
  66 +msgstr "záznam %u nelze pøeèíst\n"
  67
  68  #: lib/query.c:942 lib/rpminstall.c:632
  69  #, c-format
  70 --- rpm-4.0.4/po/en_RN.po.wiget Tue Jul  9 15:33:28 2002
  71 +++ rpm-4.0.4/po/en_RN.po       Tue Jul  9 15:34:56 2002
  72 @@ -2,17 +2,16 @@
  73  # Copyright (C) YEAR Free Software Foundation, Inc.
  74  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  75  #
  76 -#, fuzzy
  77  msgid ""
  78  msgstr ""
  79  "Project-Id-Version: rpm 4.0.3\n"
  80  "POT-Creation-Date: 2002-02-14 12:28-0500\n"
  81 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  82 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  83 -"Language-Team: LANGUAGE <LL@li.org>\n"
  84 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
  85 +"Last-Translator: en <en@example.com>\n"
  86 +"Language-Team: en <en@li.org>\n"
  87  "MIME-Version: 1.0\n"
  88 -"Content-Type: text/plain; charset=CHARSET\n"
  89 -"Content-Transfer-Encoding: ENCODING\n"
  90 +"Content-Type: text/plain; charset=ISO-8859-1\n"
  91 +"Content-Transfer-Encoding: 8bit\n"
  92
  93  #: build.c:39
  94  #, c-format
  95 --- rpm-4.0.4/po/es.po.wiget    Tue Jul  9 15:36:51 2002
  96 +++ rpm-4.0.4/po/es.po  Tue Jul  9 15:38:03 2002
  97 @@ -2,17 +2,16 @@
  98  # Copyright (C) YEAR Free Software Foundation, Inc.
  99  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 100  #
 101 -#, fuzzy
 102  msgid ""
 103  msgstr ""
 104  "Project-Id-Version: rpm 4.0.3\n"
 105  "POT-Creation-Date: 2002-02-14 12:28-0500\n"
 106 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 107 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 108 -"Language-Team: LANGUAGE <LL@li.org>\n"
 109 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 110 +"Last-Translator: es <es@li.org>\n"
 111 +"Language-Team: es <es@li.org>\n"
 112  "MIME-Version: 1.0\n"
 113 -"Content-Type: text/plain; charset=CHARSET\n"
 114 -"Content-Transfer-Encoding: ENCODING\n"
 115 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 116 +"Content-Transfer-Encoding: 8bit\n"
 117
 118  #: build.c:39
 119  #, c-format
 120 --- rpm-4.0.4/po/eu_ES.po.wiget Tue Jul  9 15:38:14 2002
 121 +++ rpm-4.0.4/po/eu_ES.po       Tue Jul  9 15:43:02 2002
 122 @@ -2,17 +2,16 @@
 123  # Copyright (C) YEAR Free Software Foundation, Inc.
 124  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 125  #
 126 -#, fuzzy
 127  msgid ""
 128  msgstr ""
 129  "Project-Id-Version: rpm 4.0.3\n"
 130  "POT-Creation-Date: 2002-02-14 12:28-0500\n"
 131 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 132 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 133 -"Language-Team: LANGUAGE <LL@li.org>\n"
 134 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 135 +"Last-Translator: eu <eu@li.org>\n"
 136 +"Language-Team: eu <eu@li.org>\n"
 137  "MIME-Version: 1.0\n"
 138 -"Content-Type: text/plain; charset=CHARSET\n"
 139 -"Content-Transfer-Encoding: ENCODING\n"
 140 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 141 +"Content-Transfer-Encoding: 8bit\n"
 142
 143  #: build.c:39
 144  #, c-format
 145 --- rpm-4.0.4/po/fr.po.wiget    Tue Jul  9 15:43:11 2002
 146 +++ rpm-4.0.4/po/fr.po  Tue Jul  9 15:44:16 2002
 147 @@ -2,17 +2,16 @@
 148  # Copyright (C) YEAR Free Software Foundation, Inc.
 149  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 150  #
 151 -#, fuzzy
 152  msgid ""
 153  msgstr ""
 154  "Project-Id-Version: rpm 4.0.3\n"
 155  "POT-Creation-Date: 2002-02-14 12:28-0500\n"
 156 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 157 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 158 -"Language-Team: LANGUAGE <LL@li.org>\n"
 159 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 160 +"Last-Translator: fr <fr@li.org>\n"
 161 +"Language-Team: fr <fr@li.org>\n"
 162  "MIME-Version: 1.0\n"
 163 -"Content-Type: text/plain; charset=CHARSET\n"
 164 -"Content-Transfer-Encoding: ENCODING\n"
 165 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 166 +"Content-Transfer-Encoding: 8bit\n"
 167
 168  #: build.c:39
 169  #, fuzzy, c-format
 170 --- rpm-4.0.4/po/hu.po.wiget    Tue Jul  9 15:44:36 2002
 171 +++ rpm-4.0.4/po/hu.po  Tue Jul  9 15:45:44 2002
 172 @@ -2,17 +2,16 @@
 173  # Copyright (C) YEAR Free Software Foundation, Inc.
 174  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 175  #
 176 -#, fuzzy
 177  msgid ""
 178  msgstr ""
 179  "Project-Id-Version: rpm 4.0.3\n"
 180  "POT-Creation-Date: 2002-02-14 12:28-0500\n"
 181 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 182 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 183 -"Language-Team: LANGUAGE <LL@li.org>\n"
 184 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 185 +"Last-Translator: hu <hu@li.org>\n"
 186 +"Language-Team: hu <hu@li.org>\n"
 187  "MIME-Version: 1.0\n"
 188 -"Content-Type: text/plain; charset=CHARSET\n"
 189 -"Content-Transfer-Encoding: ENCODING\n"
 190 +"Content-Type: text/plain; charset=ISO-8859-2\n"
 191 +"Content-Transfer-Encoding: 8bit\n"
 192
 193  #: build.c:39
 194  #, c-format
 195 --- rpm-4.0.4/po/id.po.wiget    Tue Jul  9 15:45:53 2002
 196 +++ rpm-4.0.4/po/id.po  Tue Jul  9 15:47:01 2002
 197 @@ -2,17 +2,16 @@
 198  # Copyright (C) YEAR Free Software Foundation, Inc.
 199  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 200  #
 201 -#, fuzzy
 202  msgid ""
 203  msgstr ""
 204  "Project-Id-Version: rpm 4.0.3\n"
 205  "POT-Creation-Date: 2002-02-14 12:28-0500\n"
 206 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 207 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 208 -"Language-Team: LANGUAGE <LL@li.org>\n"
 209 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 210 +"Last-Translator: id <id@li.org>\n"
 211 +"Language-Team: id <id@li.org>\n"
 212  "MIME-Version: 1.0\n"
 213 -"Content-Type: text/plain; charset=CHARSET\n"
 214 -"Content-Transfer-Encoding: ENCODING\n"
 215 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 216 +"Content-Transfer-Encoding: 8bit\n"
 217
 218  #: build.c:39
 219  #, c-format
 220 --- rpm-4.0.4/po/is.po.wiget    Tue Jul  9 15:47:16 2002
 221 +++ rpm-4.0.4/po/is.po  Tue Jul  9 15:47:53 2002
 222 @@ -3182,7 +3182,7 @@
 223  #: lib/rpminstall.c:370
 224  #, c-format
 225  msgid "cannot open Packages database in %s\n"
 226 -msgstr "get ekki opnað pakka gagnagrunn í\n"
 227 +msgstr "get ekki opnað pakka gagnagrunn í %s\n"
 228
 229  #: lib/rpminstall.c:393
 230  #, c-format
 231 --- rpm-4.0.4/po/it.po.wiget    Tue Jul  9 15:48:16 2002
 232 +++ rpm-4.0.4/po/it.po  Tue Jul  9 15:50:35 2002
 233 @@ -2,17 +2,16 @@
 234  # Copyright (C) YEAR Free Software Foundation, Inc.
 235  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 236  #
 237 -#, fuzzy
 238  msgid ""
 239  msgstr ""
 240  "Project-Id-Version: rpm 4.0.3\n"
 241  "POT-Creation-Date: 2002-02-14 12:28-0500\n"
 242 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 243 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 244 -"Language-Team: LANGUAGE <LL@li.org>\n"
 245 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 246 +"Last-Translator: it <it@li.org>\n"
 247 +"Language-Team: it <it@li.org>\n"
 248  "MIME-Version: 1.0\n"
 249 -"Content-Type: text/plain; charset=CHARSET\n"
 250 -"Content-Transfer-Encoding: ENCODING\n"
 251 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 252 +"Content-Transfer-Encoding: 8bit\n"
 253
 254  #: build.c:39
 255  #, c-format
 256 --- rpm-4.0.4/po/ja.po.wiget    Tue Jul  9 15:51:37 2002
 257 +++ rpm-4.0.4/po/ja.po  Tue Jul  9 15:52:11 2002
 258 @@ -2,7 +2,6 @@
 259  # Kanda Mitsru <kanda@nn.iij4u.or.jp>
 260  # rpm message catalog
 261  # Kanda Mitsru <kanda@nn.iij4u.or.jp>
 262 -#, fuzzy
 263  msgid ""
 264  msgstr ""
 265  "Project-Id-Version: rpm 4.0.3\n"
 266 @@ -3600,7 +3599,7 @@
 267  #: lib/signature.c:325
 268  #, c-format
 269  msgid "PGP sig size: %d\n"
 270 -msgstr "PGP ½ðÌ¾¥µ¥¤¥º: %s\n"
 271 +msgstr "PGP ½ðÌ¾¥µ¥¤¥º: %d\n"
 272
 273  #: lib/signature.c:338 lib/signature.c:432
 274  #, fuzzy
 275 --- rpm-4.0.4/po/pt.po.wiget    Tue Jul  9 15:52:36 2002
 276 +++ rpm-4.0.4/po/pt.po  Tue Jul  9 15:53:46 2002
 277 @@ -6,7 +6,7 @@
 278  "Last-Translator: José Nuno Coelho Sanarra Pires\n"
 279  "Language-Team: pt <kde@poli.org>\n"
 280  "MIME-Version: 1.0\n"
 281 -"Content-Type: text/plain; charset=iso-latin1\n"
 282 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 283  "Content-Transfer-Encoding: none\n"
 284
 285  #: build.c:39
 286 @@ -1476,12 +1476,12 @@
 287  #: build/files.c:2247
 288  #, c-format
 289  msgid "Couldn't exec %s: %s\n"
 290 -msgstr "Não consegui executar o %s: %S\n"
 291 +msgstr "Não consegui executar o %s: %s\n"
 292
 293  #: build/files.c:2252
 294  #, c-format
 295  msgid "Couldn't fork %s: %s\n"
 296 -msgstr "Não consegui executar à parte o %s: &s\n"
 297 +msgstr "Não consegui executar à parte o %s: %s\n"
 298
 299  #: build/files.c:2336
 300  #, c-format
 301 @@ -3907,7 +3907,7 @@
 302  #: rpmio/macro.c:716
 303  #, c-format
 304  msgid "Macro %%%s has illegal name (%%undefine)\n"
 305 -msgstr "A macro %%%s tem um nome ilegal (%%%undefine)\n"
 306 +msgstr "A macro %%%s tem um nome ilegal (%%undefine)\n"
 307
 308  #: rpmio/macro.c:828
 309  #, c-format
 310 --- rpm-4.0.4/po/uk.po.wiget    Tue Jul  9 16:00:10 2002
 311 +++ rpm-4.0.4/po/uk.po  Tue Jul  9 16:00:02 2002
 312 @@ -2,17 +2,16 @@
 313  # Copyright (C) YEAR Free Software Foundation, Inc.
 314  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 315  #
 316 -#, fuzzy
 317  msgid ""
 318  msgstr ""
 319  "Project-Id-Version: rpm 4.0.3\n"
 320  "POT-Creation-Date: 2002-02-14 12:28-0500\n"
 321 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 322 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 323 -"Language-Team: LANGUAGE <LL@li.org>\n"
 324 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 325 +"Last-Translator: uk <none@example.com>\n"
 326 +"Language-Team: uk <uk@li.org>\n"
 327  "MIME-Version: 1.0\n"
 328 -"Content-Type: text/plain; charset=CHARSET\n"
 329 -"Content-Transfer-Encoding: ENCODING\n"
 330 +"Content-Type: text/plain; charset=KOI8-U\n"
 331 +"Content-Transfer-Encoding: 8bit\n"
 332
 333  #: build.c:39
 334  #, c-format
 335 --- rpm-4.0.4/po/wa.po.wiget    Tue Jul  9 16:00:21 2002
 336 +++ rpm-4.0.4/po/wa.po  Tue Jul  9 16:01:59 2002
 337 @@ -2,17 +2,16 @@
 338  # Copyright (C) YEAR Free Software Foundation, Inc.
 339  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 340  #
 341 -#, fuzzy
 342  msgid ""
 343  msgstr ""
 344  "Project-Id-Version: rpm 4.0.3\n"
 345  "POT-Creation-Date: 2002-02-14 12:28-0500\n"
 346 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 347 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 348 -"Language-Team: LANGUAGE <LL@li.org>\n"
 349 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 350 +"Last-Translator: wa <none@exmaple.com>\n"
 351 +"Language-Team: wa <wa@li.org>\n"
 352  "MIME-Version: 1.0\n"
 353 -"Content-Type: text/plain; charset=CHARSET\n"
 354 -"Content-Transfer-Encoding: ENCODING\n"
 355 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 356 +"Content-Transfer-Encoding: 8bit\n"
 357
 358  #: build.c:39
 359  #, c-format
 360 --- rpm-4.0.4/po/zh.po.wiget    Tue Jul  9 16:02:07 2002
 361 +++ rpm-4.0.4/po/zh.po  Tue Jul  9 16:04:53 2002
 362 @@ -2,17 +2,16 @@
 363  # Copyright (C) YEAR Free Software Foundation, Inc.
 364  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 365  #
 366 -#, fuzzy
 367  msgid ""
 368  msgstr ""
 369  "Project-Id-Version: rpm 4.0.3\n"
 370  "POT-Creation-Date: 2002-02-14 12:28-0500\n"
 371 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 372 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 373 -"Language-Team: LANGUAGE <LL@li.org>\n"
 374 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 375 +"Last-Translator: en <en@example.com>\n"
 376 +"Language-Team: en <en@li.org>\n"
 377  "MIME-Version: 1.0\n"
 378 -"Content-Type: text/plain; charset=CHARSET\n"
 379 -"Content-Transfer-Encoding: ENCODING\n"
 380 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 381 +"Content-Transfer-Encoding: 8bit\n"
 382
 383  #: build.c:39
 384  #, c-format
 385 --- rpm-4.0.4/po/zh_CN.GB2312.po.wiget  Tue Jul  9 16:05:18 2002
 386 +++ rpm-4.0.4/po/zh_CN.GB2312.po        Tue Jul  9 16:06:30 2002
 387 @@ -2,17 +2,16 @@
 388  # Copyright (C) YEAR Free Software Foundation, Inc.
 389  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 390  #
 391 -#, fuzzy
 392  msgid ""
 393  msgstr ""
 394  "Project-Id-Version: rpm 4.0.3\n"
 395  "POT-Creation-Date: 2002-02-14 12:28-0500\n"
 396 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 397 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 398 -"Language-Team: LANGUAGE <LL@li.org>\n"
 399 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 400 +"Last-Translator: none <none@example.com>\n"
 401 +"Language-Team: zh_CN <zh_CN@li.org>\n"
 402  "MIME-Version: 1.0\n"
 403 -"Content-Type: text/plain; charset=CHARSET\n"
 404 -"Content-Transfer-Encoding: ENCODING\n"
 405 +"Content-Type: text/plain; charset=GB2312\n"
 406 +"Content-Transfer-Encoding: 8bit\n"
 407
 408  #: build.c:39
 409  #, c-format
 410 --- rpm-4.0.4/popt/Makefile.am.wiget2   Tue Jul  9 16:32:32 2002
 411 +++ rpm-4.0.4/popt/Makefile.am  Tue Jul  9 16:32:13 2002
 412 @@ -2,12 +2,12 @@
 413
 414  AUTOMAKE_OPTIONS = 1.4 foreign
 415
 416 -EXTRA_DIST = autogen.sh CHANGES $(man_MANS) popt.spec \
 417 +EXTRA_DIST = config.rpath  autogen.sh CHANGES $(man_MANS) popt.spec \
 418         testit.sh test-poptrc \
 419         po/*.in po/*.po po/popt.pot \
 420         popt.ps
 421
 422 -SUBDIRS = intl po
 423 +SUBDIRS = m4  po
 424
 425  INCLUDES = -I$(top_srcdir)
 426
 427 @@ -66,3 +66,5 @@
 428         rm -rf doxygen
 429         mkdir -p doxygen
 430         doxygen
 431 +
 432 +ACLOCAL_AMFLAGS = -I m4
 433 --- rpm-4.0.4/popt/configure.in.wiget2  Tue Jul  9 16:32:42 2002
 434 +++ rpm-4.0.4/popt/configure.in Tue Jul  9 16:32:13 2002
 435 @@ -82,5 +82,5 @@
 436  AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH")
 437  AC_SUBST(POPT_SOURCE_PATH)
 438
 439 -AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in],
 440 -       [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
 441 +AC_OUTPUT([Doxyfile Makefile po/Makefile.in m4/Makefile ],
 442 +       [])
 443 --- rpm-4.0.4/popt/po/de.po.wi2 Tue Jul  9 16:37:18 2002
 444 +++ rpm-4.0.4/popt/po/de.po     Tue Jul  9 16:38:19 2002
 445 @@ -2,17 +2,16 @@
 446  # Copyright (C) YEAR Free Software Foundation, Inc.
 447  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 448  #
 449 -#, fuzzy
 450  msgid ""
 451  msgstr ""
 452  "Project-Id-Version: popt 1.6.3\n"
 453  "POT-Creation-Date: 2002-01-19 09:14-0500\n"
 454 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 455 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 456 -"Language-Team: LANGUAGE <LL@li.org>\n"
 457 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 458 +"Last-Translator: de <none@example.com>\n"
 459 +"Language-Team: de <de@li.org>\n"
 460  "MIME-Version: 1.0\n"
 461 -"Content-Type: text/plain; charset=CHARSET\n"
 462 -"Content-Transfer-Encoding: ENCODING\n"
 463 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 464 +"Content-Transfer-Encoding: 8bit\n"
 465
 466  #: popt.c:29
 467  msgid "unknown errno"
 468 --- rpm-4.0.4/popt/po/eu_ES.po.wi2      Tue Jul  9 16:39:24 2002
 469 +++ rpm-4.0.4/popt/po/eu_ES.po  Tue Jul  9 16:39:49 2002
 470 @@ -2,17 +2,16 @@
 471  # Copyright (C) YEAR Free Software Foundation, Inc.
 472  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 473  #
 474 -#, fuzzy
 475  msgid ""
 476  msgstr ""
 477  "Project-Id-Version: popt 1.6.3\n"
 478  "POT-Creation-Date: 2002-01-19 09:14-0500\n"
 479 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 480 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 481 -"Language-Team: LANGUAGE <LL@li.org>\n"
 482 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 483 +"Last-Translator: de <none@example.com>\n"
 484 +"Language-Team: de <de@li.org>\n"
 485  "MIME-Version: 1.0\n"
 486 -"Content-Type: text/plain; charset=CHARSET\n"
 487 -"Content-Transfer-Encoding: ENCODING\n"
 488 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 489 +"Content-Transfer-Encoding: 8bit\n"
 490
 491  #: popt.c:29
 492  msgid "unknown errno"
 493 --- rpm-4.0.4/popt/po/fi.po.wi2 Tue Jul  9 16:39:58 2002
 494 +++ rpm-4.0.4/popt/po/fi.po     Tue Jul  9 16:44:16 2002
 495 @@ -2,17 +2,16 @@
 496  # Copyright (C) YEAR Free Software Foundation, Inc.
 497  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 498  #
 499 -#, fuzzy
 500  msgid ""
 501  msgstr ""
 502  "Project-Id-Version: popt 1.6.3\n"
 503  "POT-Creation-Date: 2002-01-19 09:14-0500\n"
 504 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 505 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 506 -"Language-Team: LANGUAGE <LL@li.org>\n"
 507 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 508 +"Last-Translator: de <none@example.com>\n"
 509 +"Language-Team: de <de@li.org>\n"
 510  "MIME-Version: 1.0\n"
 511 -"Content-Type: text/plain; charset=CHARSET\n"
 512 -"Content-Transfer-Encoding: ENCODING\n"
 513 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 514 +"Content-Transfer-Encoding: 8bit\n"
 515
 516  #: popt.c:29
 517  msgid "unknown errno"
 518 --- rpm-4.0.4/popt/po/fr.po.wi2 Tue Jul  9 16:44:25 2002
 519 +++ rpm-4.0.4/popt/po/fr.po     Tue Jul  9 16:45:24 2002
 520 @@ -2,17 +2,16 @@
 521  # Copyright (C) YEAR Free Software Foundation, Inc.
 522  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 523  #
 524 -#, fuzzy
 525  msgid ""
 526  msgstr ""
 527  "Project-Id-Version: popt 1.6.3\n"
 528  "POT-Creation-Date: 2002-01-19 09:14-0500\n"
 529 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 530 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 531 -"Language-Team: LANGUAGE <LL@li.org>\n"
 532 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 533 +"Last-Translator: de <none@example.com>\n"
 534 +"Language-Team: de <de@li.org>\n"
 535  "MIME-Version: 1.0\n"
 536 -"Content-Type: text/plain; charset=CHARSET\n"
 537 -"Content-Transfer-Encoding: ENCODING\n"
 538 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 539 +"Content-Transfer-Encoding: 8bit\n"
 540
 541  #: popt.c:29
 542  msgid "unknown errno"
 543 --- rpm-4.0.4/popt/po/id.po.wi2 Tue Jul  9 16:45:36 2002
 544 +++ rpm-4.0.4/popt/po/id.po     Tue Jul  9 16:45:55 2002
 545 @@ -2,17 +2,16 @@
 546  # Copyright (C) YEAR Free Software Foundation, Inc.
 547  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 548  #
 549 -#, fuzzy
 550  msgid ""
 551  msgstr ""
 552  "Project-Id-Version: popt 1.6.3\n"
 553  "POT-Creation-Date: 2002-01-19 09:14-0500\n"
 554 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 555 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 556 -"Language-Team: LANGUAGE <LL@li.org>\n"
 557 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 558 +"Last-Translator: de <none@example.com>\n"
 559 +"Language-Team: de <de@li.org>\n"
 560  "MIME-Version: 1.0\n"
 561 -"Content-Type: text/plain; charset=CHARSET\n"
 562 -"Content-Transfer-Encoding: ENCODING\n"
 563 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 564 +"Content-Transfer-Encoding: 8bit\n"
 565
 566  #: popt.c:29
 567  msgid "unknown errno"
 568 --- rpm-4.0.4/popt/po/it.po.wi2 Tue Jul  9 16:46:03 2002
 569 +++ rpm-4.0.4/popt/po/it.po     Tue Jul  9 16:46:25 2002
 570 @@ -2,17 +2,16 @@
 571  # Copyright (C) YEAR Free Software Foundation, Inc.
 572  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 573  #
 574 -#, fuzzy
 575  msgid ""
 576  msgstr ""
 577  "Project-Id-Version: popt 1.6.3\n"
 578  "POT-Creation-Date: 2002-01-19 09:14-0500\n"
 579 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 580 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 581 -"Language-Team: LANGUAGE <LL@li.org>\n"
 582 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 583 +"Last-Translator: de <none@example.com>\n"
 584 +"Language-Team: de <de@li.org>\n"
 585  "MIME-Version: 1.0\n"
 586 -"Content-Type: text/plain; charset=CHARSET\n"
 587 -"Content-Transfer-Encoding: ENCODING\n"
 588 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 589 +"Content-Transfer-Encoding: 8bit\n"
 590
 591  #: popt.c:29
 592  msgid "unknown errno"
 593 --- rpm-4.0.4/popt/po/ja.po.wi2 Tue Jul  9 16:46:35 2002
 594 +++ rpm-4.0.4/popt/po/ja.po     Tue Jul  9 16:47:09 2002
 595 @@ -2,17 +2,16 @@
 596  # Copyright (C) YEAR Free Software Foundation, Inc.
 597  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 598  #
 599 -#, fuzzy
 600  msgid ""
 601  msgstr ""
 602  "Project-Id-Version: popt 1.6.3\n"
 603  "POT-Creation-Date: 2002-01-19 09:14-0500\n"
 604 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 605 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 606 -"Language-Team: LANGUAGE <LL@li.org>\n"
 607 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 608 +"Last-Translator: de <none@example.com>\n"
 609 +"Language-Team: de <de@li.org>\n"
 610  "MIME-Version: 1.0\n"
 611 -"Content-Type: text/plain; charset=CHARSET\n"
 612 -"Content-Transfer-Encoding: ENCODING\n"
 613 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 614 +"Content-Transfer-Encoding: 8bit\n"
 615
 616  #: popt.c:29
 617  msgid "unknown errno"
 618 --- rpm-4.0.4/popt/po/pl.po.wi2 Tue Jul  9 16:47:23 2002
 619 +++ rpm-4.0.4/popt/po/pl.po     Tue Jul  9 16:47:45 2002
 620 @@ -2,17 +2,16 @@
 621  # Copyright (C) YEAR Free Software Foundation, Inc.
 622  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 623  #
 624 -#, fuzzy
 625  msgid ""
 626  msgstr ""
 627  "Project-Id-Version: popt 1.6.3\n"
 628  "POT-Creation-Date: 2002-01-19 09:14-0500\n"
 629 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 630 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 631 -"Language-Team: LANGUAGE <LL@li.org>\n"
 632 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 633 +"Last-Translator: de <none@example.com>\n"
 634 +"Language-Team: de <de@li.org>\n"
 635  "MIME-Version: 1.0\n"
 636 -"Content-Type: text/plain; charset=CHARSET\n"
 637 -"Content-Transfer-Encoding: ENCODING\n"
 638 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 639 +"Content-Transfer-Encoding: 8bit\n"
 640
 641  #: popt.c:29
 642  msgid "unknown errno"
 643 --- rpm-4.0.4/popt/po/pt_BR.po.wi2      Tue Jul  9 16:47:58 2002
 644 +++ rpm-4.0.4/popt/po/pt_BR.po  Tue Jul  9 16:48:18 2002
 645 @@ -2,17 +2,16 @@
 646  # Copyright (C) YEAR Free Software Foundation, Inc.
 647  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 648  #
 649 -#, fuzzy
 650  msgid ""
 651  msgstr ""
 652  "Project-Id-Version: popt 1.6.3\n"
 653  "POT-Creation-Date: 2002-01-19 09:14-0500\n"
 654 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 655 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 656 -"Language-Team: LANGUAGE <LL@li.org>\n"
 657 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 658 +"Last-Translator: de <none@example.com>\n"
 659 +"Language-Team: de <de@li.org>\n"
 660  "MIME-Version: 1.0\n"
 661 -"Content-Type: text/plain; charset=CHARSET\n"
 662 -"Content-Transfer-Encoding: ENCODING\n"
 663 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 664 +"Content-Transfer-Encoding: 8bit\n"
 665
 666  #: popt.c:29
 667  msgid "unknown errno"
 668 --- rpm-4.0.4/popt/po/sr.po.wi2 Tue Jul  9 16:48:25 2002
 669 +++ rpm-4.0.4/popt/po/sr.po     Tue Jul  9 16:48:44 2002
 670 @@ -2,17 +2,16 @@
 671  # Copyright (C) YEAR Free Software Foundation, Inc.
 672  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 673  #
 674 -#, fuzzy
 675  msgid ""
 676  msgstr ""
 677  "Project-Id-Version: popt 1.6.3\n"
 678  "POT-Creation-Date: 2002-01-19 09:14-0500\n"
 679 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 680 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 681 -"Language-Team: LANGUAGE <LL@li.org>\n"
 682 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 683 +"Last-Translator: de <none@example.com>\n"
 684 +"Language-Team: de <de@li.org>\n"
 685  "MIME-Version: 1.0\n"
 686 -"Content-Type: text/plain; charset=CHARSET\n"
 687 -"Content-Transfer-Encoding: ENCODING\n"
 688 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 689 +"Content-Transfer-Encoding: 8bit\n"
 690
 691  #: popt.c:29
 692  msgid "unknown errno"
 693 --- rpm-4.0.4/popt/po/zh.po.wi2 Tue Jul  9 16:48:55 2002
 694 +++ rpm-4.0.4/popt/po/zh.po     Tue Jul  9 16:49:18 2002
 695 @@ -2,17 +2,16 @@
 696  # Copyright (C) YEAR Free Software Foundation, Inc.
 697  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 698  #
 699 -#, fuzzy
 700  msgid ""
 701  msgstr ""
 702  "Project-Id-Version: popt 1.6.3\n"
 703  "POT-Creation-Date: 2002-01-19 09:14-0500\n"
 704 -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 705 -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 706 -"Language-Team: LANGUAGE <LL@li.org>\n"
 707 +"PO-Revision-Date: 2002-07-09 01:01+0000\n"
 708 +"Last-Translator: de <none@example.com>\n"
 709 +"Language-Team: de <de@li.org>\n"
 710  "MIME-Version: 1.0\n"
 711 -"Content-Type: text/plain; charset=CHARSET\n"
 712 -"Content-Transfer-Encoding: ENCODING\n"
 713 +"Content-Type: text/plain; charset=ISO-8859-1\n"
 714 +"Content-Transfer-Encoding: 8bit\n"
 715
 716  #: popt.c:29
 717  msgid "unknown errno"